diff mbox series

Bluetooth: coredump: fix building with coredump disabled

Message ID 20230703113112.380663-1-arnd@kernel.org
State New
Headers
Series Bluetooth: coredump: fix building with coredump disabled |

Commit Message

Arnd Bergmann July 3, 2023, 11:30 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

The btmtk driver uses an IS_ENABLED() check to conditionally compile
the coredump support, but this fails to build because the hdev->dump
member is in an #ifdef:

drivers/bluetooth/btmtk.c: In function 'btmtk_process_coredump':
drivers/bluetooth/btmtk.c:386:30: error: 'struct hci_dev' has no member named 'dump'
  386 |   schedule_delayed_work(&hdev->dump.dump_timeout,
      |                              ^~

The struct member doesn't really make a huge difference in the total size,
so just remove the #ifdef around it to avoid adding similar checks
around each user.

Fixes: 872f8c253cb9e ("Bluetooth: btusb: mediatek: add MediaTek devcoredump support")
Fixes: 9695ef876fd12 ("Bluetooth: Add support for hci devcoredump")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/net/bluetooth/hci_core.h | 2 --
 1 file changed, 2 deletions(-)

Comments

patchwork-bot+bluetooth@kernel.org July 5, 2023, 11 p.m. UTC | #1 
Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Mon,  3 Jul 2023 13:30:48 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The btmtk driver uses an IS_ENABLED() check to conditionally compile
> the coredump support, but this fails to build because the hdev->dump
> member is in an #ifdef:
> 
> drivers/bluetooth/btmtk.c: In function 'btmtk_process_coredump':
> drivers/bluetooth/btmtk.c:386:30: error: 'struct hci_dev' has no member named 'dump'
>   386 |   schedule_delayed_work(&hdev->dump.dump_timeout,
>       |                              ^~
> 
> [...]

Here is the summary with links:
  - Bluetooth: coredump: fix building with coredump disabled
    https://git.kernel.org/bluetooth/bluetooth-next/c/6ca03ff0da3e

You are awesome, thank you!
diff mbox series

Patch

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c0ca3f869c923..491ab83ccafc9 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -593,9 +593,7 @@  struct hci_dev {
 	const char		*fw_info;
 	struct dentry		*debugfs;
 
-#ifdef CONFIG_DEV_COREDUMP
 	struct hci_devcoredump	dump;
-#endif
 
 	struct device		dev;