[1/2] bcma: add empty PCIe hostmode functions if support is disabled

Commit Message

Rafał Miłecki Jan. 25, 2015, 10:11 a.m. UTC

This allows us to drop some #ifdef magic (mess).

Signed-off-by: Rafa? Mi?ecki <[e-mail]>
---
 drivers/bcma/bcma_private.h | 10 +++++++++-
 drivers/bcma/driver_pci.c   |  2 --
 2 files changed, 9 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 3f314c9..3242655 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -92,7 +92,7 @@  extern void __exit bcma_host_soc_unregister_driver(void);
 #else
 static inline int __init bcma_host_soc_register_driver(void)
 {
-	return 0;
+	return false;
 }
 static inline void __exit bcma_host_soc_unregister_driver(void)
 {
@@ -107,6 +107,14 @@  extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
 void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
+#else
+static inline bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
+{
+	return 0;
+}
+static inline void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
+{
+}
 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 
 #ifdef CONFIG_BCMA_DRIVER_GPIO
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index 50329d1..b85a505 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -226,11 +226,9 @@  void bcma_core_pci_init(struct bcma_drv_pci *pc)
 	if (pc->setup_done)
 		return;
 
-#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 	pc->hostmode = bcma_core_pci_is_in_hostmode(pc);
 	if (pc->hostmode)
 		bcma_core_pci_hostmode_init(pc);
-#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 
 	if (!pc->hostmode)
 		bcma_core_pci_clientmode_init(pc);