linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Bluetooth: msft: Fix build when BT_MSFTEXT is not defined
@ 2021-09-27 22:00 Luiz Augusto von Dentz
  2021-09-27 23:03 ` bluez.test.bot
  2021-09-28  8:03 ` [PATCH] " Marcel Holtmann
  0 siblings, 2 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2021-09-27 22:00 UTC (permalink / raw)
  To: linux-bluetooth

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

ld: net/bluetooth/hci_event.o: in function `msft_suspend':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_suspend';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
ld: net/bluetooth/hci_event.o: in function `msft_resume':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_resume';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
ld: net/bluetooth/mgmt.o: in function `msft_suspend':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_suspend';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
ld: net/bluetooth/mgmt.o: in function `msft_resume':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_resume';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
ld: net/bluetooth/hci_request.o: in function `msft_suspend':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_suspend';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
ld: net/bluetooth/hci_request.o: in function `msft_resume':
/linux/net/bluetooth/msft.h:64: multiple definition of `msft_resume';
net/bluetooth/hci_core.o:/linux/net/bluetooth/msft.h:64: first defined here
make: *** [Makefile:1176: vmlinux] Error 1

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 net/bluetooth/msft.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/msft.h b/net/bluetooth/msft.h
index 27d73f82b9de..59c6e081c789 100644
--- a/net/bluetooth/msft.h
+++ b/net/bluetooth/msft.h
@@ -61,8 +61,8 @@ static inline int msft_set_filter_enable(struct hci_dev *hdev, bool enable)
 	return -EOPNOTSUPP;
 }
 
-void msft_suspend(struct hci_dev *hdev) {}
-void msft_resume(struct hci_dev *hdev) {}
+static inline void msft_suspend(struct hci_dev *hdev) {}
+static inline void msft_resume(struct hci_dev *hdev) {}
 
 static inline bool msft_curve_validity(struct hci_dev *hdev)
 {
-- 
2.31.1


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

end of thread, other threads:[~2021-09-28  8:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-27 22:00 [PATCH] Bluetooth: msft: Fix build when BT_MSFTEXT is not defined Luiz Augusto von Dentz
2021-09-27 23:03 ` bluez.test.bot
2021-09-28  8:03 ` [PATCH] " 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).