From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH] Bluetooth: msft: Fix build when BT_MSFTEXT is not defined
Date: Mon, 27 Sep 2021 15:00:24 -0700 [thread overview]
Message-ID: <20210927220024.2776585-1-luiz.dentz@gmail.com> (raw)
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
next reply other threads:[~2021-09-27 22:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 22:00 Luiz Augusto von Dentz [this message]
2021-09-27 23:03 ` Bluetooth: msft: Fix build when BT_MSFTEXT is not defined bluez.test.bot
2021-09-28 8:03 ` [PATCH] " Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927220024.2776585-1-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).