2015-11-02 09:24:13

by Valentin Rothberg

Subject: [PATCH] wireless:b43: remove last reference on B43_PCMCIA

Remove last reference on Kconfig option B43_PCMCIA, which has been
removed by commit 399500da18f7 ("ssb: pick PCMCIA host code support from
b43 driver").

Signed-off-by: Valentin Rothberg <[email protected]>
---
drivers/net/wireless/b43/main.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ec013fbd6a81..190efd3160b7 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5826,9 +5826,6 @@ static void b43_print_driverinfo(void)
#ifdef CONFIG_B43_PCI_AUTOSELECT
feat_pci = "P";
#endif
-#ifdef CONFIG_B43_PCMCIA
- feat_pcmcia = "M";
-#endif
#ifdef CONFIG_B43_PHY_N
feat_nphy = "N";
#endif
--
1.9.1

2015-11-02 09:31:27

by Rafał Miłecki

Subject: Re: [PATCH] wireless:b43: remove last reference on B43_PCMCIA

On 2 November 2015 at 10:24, Valentin Rothberg
<[email protected]> wrote:
> Remove last reference on Kconfig option B43_PCMCIA, which has been
> removed by commit 399500da18f7 ("ssb: pick PCMCIA host code support from
> b43 driver").
>
> Signed-off-by: Valentin Rothberg <[email protected]>
> ---
> drivers/net/wireless/b43/main.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index ec013fbd6a81..190efd3160b7 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -5826,9 +5826,6 @@ static void b43_print_driverinfo(void)
> #ifdef CONFIG_B43_PCI_AUTOSELECT
> feat_pci = "P";
> #endif
> -#ifdef CONFIG_B43_PCMCIA
> - feat_pcmcia = "M";
> -#endif
> #ifdef CONFIG_B43_PHY_N
> feat_nphy = "N";
> #endif

There is no point of leaving feat_pcmcia variable.

--
Rafał

2015-11-02 09:41:00

by Valentin Rothberg

Subject: Re: [PATCH] wireless:b43: remove last reference on B43_PCMCIA

On Nov 02 '15 10:31, Rafał Miłecki wrote:
> On 2 November 2015 at 10:24, Valentin Rothberg
> <[email protected]> wrote:
> > Remove last reference on Kconfig option B43_PCMCIA, which has been
> > removed by commit 399500da18f7 ("ssb: pick PCMCIA host code support from
> > b43 driver").
> >
> > Signed-off-by: Valentin Rothberg <[email protected]>
> > ---
> > drivers/net/wireless/b43/main.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> > index ec013fbd6a81..190efd3160b7 100644
> > --- a/drivers/net/wireless/b43/main.c
> > +++ b/drivers/net/wireless/b43/main.c
> > @@ -5826,9 +5826,6 @@ static void b43_print_driverinfo(void)
> > #ifdef CONFIG_B43_PCI_AUTOSELECT
> > feat_pci = "P";
> > #endif
> > -#ifdef CONFIG_B43_PCMCIA
> > - feat_pcmcia = "M";
> > -#endif
> > #ifdef CONFIG_B43_PHY_N
> > feat_nphy = "N";
> > #endif
>
> There is no point of leaving feat_pcmcia variable.

Sorry, I will fix and resend the patch.

Thanks,
Valentin

2015-11-02 09:56:05

by Valentin Rothberg

Subject: [PATCH v2] wireless:b43: remove last reference on B43_PCMCIA

Remove last reference on Kconfig option B43_PCMCIA, which has been
removed by commit 399500da18f7 ("ssb: pick PCMCIA host code support from
b43 driver").

Signed-off-by: Valentin Rothberg <[email protected]>
---
drivers/net/wireless/b43/main.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ec013fbd6a81..524e5f4a07dd 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5820,15 +5820,12 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason)

static void b43_print_driverinfo(void)
{
- const char *feat_pci = "", *feat_pcmcia = "", *feat_nphy = "",
- *feat_leds = "", *feat_sdio = "";
+ const char *feat_pci = "", *feat_nphy = "", *feat_leds = "",
+ *feat_sdio = "";

#ifdef CONFIG_B43_PCI_AUTOSELECT
feat_pci = "P";
#endif
-#ifdef CONFIG_B43_PCMCIA
- feat_pcmcia = "M";
-#endif
#ifdef CONFIG_B43_PHY_N
feat_nphy = "N";
#endif
@@ -5838,10 +5835,8 @@ static void b43_print_driverinfo(void)
#ifdef CONFIG_B43_SDIO
feat_sdio = "S";
#endif
- printk(KERN_INFO "Broadcom 43xx driver loaded "
- "[ Features: %s%s%s%s%s ]\n",
- feat_pci, feat_pcmcia, feat_nphy,
- feat_leds, feat_sdio);
+ printk(KERN_INFO "Broadcom 43xx driver loaded [ Features: %s%s%s%s ]\n",
+ feat_pci, feat_nphy, feat_leds, feat_sdio);
}

static int __init b43_init(void)
--
1.9.1