linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] Bluetooth: hci_bcm: fix build error without CONFIG_PM
@ 2017-10-11 13:46 Arnd Bergmann
  2017-10-11 13:47 ` [PATCH 2/2] Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS Arnd Bergmann
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Arnd Bergmann @ 2017-10-11 13:46 UTC (permalink / raw)
  To: Marcel Holtmann, Gustavo Padovan, Johan Hedberg
  Cc: Arnd Bergmann, Hans de Goede, Loic Poulain, David S. Miller,
	linux-bluetooth, linux-kernel

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(+)

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);
 
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2017-10-13 10:58 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-11 13:46 [PATCH 1/2] Bluetooth: hci_bcm: fix build error without CONFIG_PM Arnd Bergmann
2017-10-11 13:47 ` [PATCH 2/2] Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS Arnd Bergmann
2017-10-11 14:33   ` Hans de Goede
2017-10-11 18:10     ` Marcel Holtmann
2017-10-12  8:27       ` Hans de Goede
     [not found]         ` <0E9ED850-8F65-498C-A4EB-D3413E25CFF7@holtmann.org>
2017-10-13 10:09           ` Johan Hovold
2017-10-13 10:58             ` Hans de Goede
2017-10-11 14:29 ` [PATCH 1/2] Bluetooth: hci_bcm: fix build error without CONFIG_PM Hans de Goede
2017-10-11 18:11 ` Marcel Holtmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).