Skip to contentSkip to conversation

wireless:b43: remove last reference on B43_PCMCIA

PATCH Superseded Valentin Rothberg 2 participants 5 messages Nov 2, 2015 – Jan 26, 2016 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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").

---
 drivers/net/wireless/b43/main.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/wireless/b43/main.c +0 -3
index ec013fbd6a81..190efd3160b7 100644
@@ -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
Signature · 1 line
1.9.1
#1 lore raw
Quoted 14 lines · Valentin Rothberg

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

---
 drivers/net/wireless/b43/main.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/wireless/b43/main.c +0 -0
index ec013fbd6a81..190efd3160b7 100644

drivers/net/wireless/b43/main.c static void b43_print_driverinfo(void) · line 5831

Quoted 9 lines
drivers/net/wireless/b43/main.c +0 -3
@@ -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.

Signature · 1 line
Rafał
#2 lore raw
Quoted 11 lines · Rafał Miłecki
Quoted 9 lines · Valentin Rothberg

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

---
 drivers/net/wireless/b43/main.c | 3 ---
 1 file changed, 3 deletions(-)
Quoted 16 lines
Quoted 5 lines
drivers/net/wireless/b43/main.c +0 -0
index ec013fbd6a81..190efd3160b7 100644

drivers/net/wireless/b43/main.c static void b43_print_driverinfo(void) · line 5831

Quoted 9 lines
drivers/net/wireless/b43/main.c +0 -3
@@ -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

#3 lore raw

PATCH v2 1/1 wireless:b43: remove last reference on B43_PCMCIA

In reply to Valentin Rothberg

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

---
 drivers/net/wireless/b43/main.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/net/wireless/b43/main.c +4 -9
index ec013fbd6a81..524e5f4a07dd 100644
@@ -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)
Signature · 1 line
1.9.1
#4 lore raw
Quoted 3 lines · Valentin Rothberg

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

Please resend this patch using b43-dev@ and linux-wireless@ mailing lists as stated in MAINTAINERS.