[PATCH] bcm47xx_sprom: Fix compilation with ssb/bcma as module

[PATCH] bcm47xx_sprom: Fix compilation with ssb/bcma as module

[Rafał Miłecki]

It was failing due to unknown ssb_arch_register_fallback_sprom or
bcma_arch_register_fallback_sprom with CONFIG_SSB=m or CONFIG_BCMA=m

Fixes: e8a46c88b516 ("MIPS: BCM47xx: Move SPROM driver to drivers/firmware/¨)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
Ralf, this is for mips-for-linux-next. If you happen to rebase your tree, you
may squash this one with e8a46c88b516.
Sorry for the problem.
---
 drivers/firmware/broadcom/bcm47xx_sprom.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c b/drivers/firmware/broadcom/bcm47xx_sprom.c
index 5dfd459..c3d1bf2 100644
--- a/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -601,7 +601,7 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
 	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
 }
 
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
 static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
 {
 	char prefix[10];
@@ -624,7 +624,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
 }
 #endif
 
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
 /*
  * Having many NVRAM entries for PCI devices led to repeating prefixes like
  * pci/1/1/ all the time and wasting flash space. So at some point Broadcom
@@ -719,12 +719,12 @@ int bcm47xx_sprom_register_fallbacks(void)
 	if (bcm47xx_sprom_registered)
 		return 0;
 
-#if defined(CONFIG_SSB_SPROM)
+#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM)
 	if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
 		pr_warn("Failed to registered ssb SPROM handler\n");
 #endif
 
-#if defined(CONFIG_BCMA)
+#if IS_BUILTIN(CONFIG_BCMA)
 	if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
 		pr_warn("Failed to registered bcma SPROM handler\n");
 #endif
-- 
1.8.4.5

Re: [PATCH] bcm47xx_sprom: Fix compilation with ssb/bcma as module

[Ralf Baechle]

On Tue, Mar 08, 2016 at 07:59:32AM +0100, Rafał Miłecki wrote:

> It was failing due to unknown ssb_arch_register_fallback_sprom or
> bcma_arch_register_fallback_sprom with CONFIG_SSB=m or CONFIG_BCMA=m
> 
> Fixes: e8a46c88b516 ("MIPS: BCM47xx: Move SPROM driver to drivers/firmware/¨)
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> Ralf, this is for mips-for-linux-next. If you happen to rebase your tree, you
> may squash this one with e8a46c88b516.

I've folded your patch into e8a46c88b516.

  Ralf