2013/6/25 Jonas Gorski <jogo@xxxxxxxxxxx>: > On Tue, Jun 25, 2013 at 5:34 PM, Rafał Miłecki <zajec5@xxxxxxxxx> wrote: >> This allows enabling support for extra hardware with just a module >> param, without kernel/module recompilation. >> >> Signed-off-by: Rafał Miłecki <zajec5@xxxxxxxxx> >> --- >> drivers/net/wireless/b43/Kconfig | 6 ------ >> drivers/net/wireless/b43/main.c | 16 ++++++++++++++-- >> 2 files changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig >> index 3f21e0b..51ff0b1 100644 >> --- a/drivers/net/wireless/b43/Kconfig >> +++ b/drivers/net/wireless/b43/Kconfig >> @@ -31,12 +31,6 @@ config B43_BCMA >> depends on B43 && (BCMA = y || BCMA = B43) >> default y >> >> -config B43_BCMA_EXTRA >> - bool "Hardware support that overlaps with the brcmsmac driver" >> - depends on B43_BCMA >> - default n if BRCMSMAC >> - default y >> - >> config B43_SSB >> bool >> depends on B43 && (SSB = y || SSB = B43) >> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c >> index a95b77a..583993c 100644 >> --- a/drivers/net/wireless/b43/main.c >> +++ b/drivers/net/wireless/b43/main.c >> @@ -113,13 +113,19 @@ static int b43_modparam_pio = 0; >> module_param_named(pio, b43_modparam_pio, int, 0644); >> MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO"); >> >> +#ifdef CONFIG_BRCMSMAC > > This is only defined if BRCMSMAC is built-in, but not if it is built > as a module; then it's CONFIG_BRCMSMAC_MODULE, which is probably not > what you want. To easily catch both, use IS_ENABLED(CONFIG_BRCMSMAC). > >> +static int modparam_allhwsupport; >> +#else >> +static int modparam_allhwsupport = 1; >> +#endif > > And since IS_ENABLED returns 0 or 1 you should be able to reduce it to one line: > > static int modparam_allhwsupport = !IS_ENABLED(CONFIG_BRCMSMAC); I love learning new tricks all the time :) -- Rafał -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
