| Message ID | 20171011134640.3152236-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 81a1905382a380beeba201ce41276afd9035dc64 |
| Headers | show |
| Series | [1/2] Bluetooth: hci_bcm: fix build error without CONFIG_PM | expand |
Hi, On 11-10-17 15:46, Arnd Bergmann wrote: > This was introduced by the rework adding PM support: > > drivers/bluetooth/hci_bcm.c: In function 'bcm_device_exists': > drivers/bluetooth/hci_bcm.c:156:22: error: 'struct bcm_device' has no member named 'hu' > if (device && device->hu && device->hu->serdev) > ^~ > > The pointer is not available otherwise, so I'm enclosing > all references in an #ifdef here. > > Fixes: 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the serdev driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> I had this on my TODO after the buildbot errors, thank you for fixing this. The fix looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/bluetooth/hci_bcm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c > index ab1455e63b92..089bd0473451 100644 > --- a/drivers/bluetooth/hci_bcm.c > +++ b/drivers/bluetooth/hci_bcm.c > @@ -152,9 +152,11 @@ static bool bcm_device_exists(struct bcm_device *device) > { > struct list_head *p; > > +#ifdef CONFIG_PM > /* Devices using serdev always exist */ > if (device && device->hu && device->hu->serdev) > return true; > +#endif > > list_for_each(p, &bcm_device_list) { > struct bcm_device *dev = list_entry(p, struct bcm_device, list); > @@ -965,7 +967,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev) > return -ENOMEM; > > bcmdev->dev = &serdev->dev; > +#ifdef CONFIG_PM > bcmdev->hu = &bcmdev->serdev_hu; > +#endif > bcmdev->serdev_hu.serdev = serdev; > serdev_device_set_drvdata(serdev, bcmdev); > >
Hi Arnd, > This was introduced by the rework adding PM support: > > drivers/bluetooth/hci_bcm.c: In function 'bcm_device_exists': > drivers/bluetooth/hci_bcm.c:156:22: error: 'struct bcm_device' has no member named 'hu' > if (device && device->hu && device->hu->serdev) > ^~ > > The pointer is not available otherwise, so I'm enclosing > all references in an #ifdef here. > > Fixes: 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the serdev driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/bluetooth/hci_bcm.c | 4 ++++ > 1 file changed, 4 insertions(+) both patches have been applied to bluetooth-next tree. Regards Marcel
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index ab1455e63b92..089bd0473451 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -152,9 +152,11 @@ static bool bcm_device_exists(struct bcm_device *device) { struct list_head *p; +#ifdef CONFIG_PM /* Devices using serdev always exist */ if (device && device->hu && device->hu->serdev) return true; +#endif list_for_each(p, &bcm_device_list) { struct bcm_device *dev = list_entry(p, struct bcm_device, list); @@ -965,7 +967,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev) return -ENOMEM; bcmdev->dev = &serdev->dev; +#ifdef CONFIG_PM bcmdev->hu = &bcmdev->serdev_hu; +#endif bcmdev->serdev_hu.serdev = serdev; serdev_device_set_drvdata(serdev, bcmdev);
This was introduced by the rework adding PM support: drivers/bluetooth/hci_bcm.c: In function 'bcm_device_exists': drivers/bluetooth/hci_bcm.c:156:22: error: 'struct bcm_device' has no member named 'hu' if (device && device->hu && device->hu->serdev) ^~ The pointer is not available otherwise, so I'm enclosing all references in an #ifdef here. Fixes: 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the serdev driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/bluetooth/hci_bcm.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.9.0