Skip to contentSkip to conversation

b43: Remove redundant code

PATCH In review Abaci Team 2 participants 2 messages Jan 28, 2021

Subsystems (3)
lore
Share & tools
lore

Abaci Team

author
#0 lore raw

PATCH 1/1 b43: Remove redundant code

Fix the following coccicheck warnings:

./drivers/net/wireless/broadcom/b43/phy_n.c:4640:2-4: WARNING: possible condition with no effect (if == else).

./drivers/net/wireless/broadcom/b43/phy_n.c:4606:2-4: WARNING: possible condition with no effect (if == else).

---
 drivers/net/wireless/broadcom/b43/phy_n.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/net/wireless/broadcom/b43/phy_n.c +0 -16
index b669dff..39a335f 100644
@@ -4601,16 +4601,6 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
 	if (nphy->hang_avoid)
 		b43_nphy_stay_in_carrier_search(dev, 1);
 
-	if (nphy->gband_spurwar_en) {
-		/* TODO: N PHY Adjust Analog Pfbw (7) */
-		if (channel == 11 && b43_is_40mhz(dev)) {
-			; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/
-		} else {
-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
-		}
-		/* TODO: N PHY Adjust CRS Min Power (0x1E) */
-	}
-
 	if (nphy->aband_spurwar_en) {
 		if (channel == 54) {
 			tone[0] = 0x20;
@@ -4636,12 +4626,6 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
 			tone[0] = 0;
 			noise[0] = 0;
 		}
-
-		if (!tone[0] && !noise[0]) {
-			; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/
-		} else {
-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
-		}
 	}
 
 	if (nphy->hang_avoid)
Signature · 1 line
1.8.3.1
#1 lore raw

Hi ..... <insert name here>,

(No proper name in the from field or signed-off-by, as you're already aware)

Quoted 23 lines · Abaci Team

Fix the following coccicheck warnings:

./drivers/net/wireless/broadcom/b43/phy_n.c:4640:2-4: WARNING: possible condition with no effect (if == else).

./drivers/net/wireless/broadcom/b43/phy_n.c:4606:2-4: WARNING: possible condition with no effect (if == else).

---
 drivers/net/wireless/broadcom/b43/phy_n.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/net/wireless/broadcom/b43/phy_n.c +0 -0
index b669dff..39a335f 100644
@@ -4601,16 +4601,6 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
        if (nphy->hang_avoid)
                b43_nphy_stay_in_carrier_search(dev, 1);

drivers/net/wireless/broadcom/b43/phy_n.c static void b43_nphy_spur_workaround(struct b43_wldev *dev) · line 4612

Quoted 10 lines
drivers/net/wireless/broadcom/b43/phy_n.c +0 -9
 
-       if (nphy->gband_spurwar_en) {
-               /* TODO: N PHY Adjust Analog Pfbw (7) */
-               if (channel == 11 && b43_is_40mhz(dev)) {
-                       ; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/
-               } else {
-                       ; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
-               }
-               /* TODO: N PHY Adjust CRS Min Power (0x1E) */
-       }

I'm not sure how useful this patch is, even though it is technically correct.

The b43 driver was almost entirely reverse engineered from various sources so there's still a lot of places, like this, where placeholder comments were written until the actual code that would have been here was ready / reverse engineered.

That said, I believe the driver works well enough for all it's users and has not seen any significant changes in a long time.

Thanks,

Signature · 6 lines
Julian Calaby

Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/

On Thu, Jan 28, 2021 at 7:53 PM Abaci Team
Quoted 53 lines · <[email protected]> wrote:

Fix the following coccicheck warnings:

./drivers/net/wireless/broadcom/b43/phy_n.c:4640:2-4: WARNING: possible condition with no effect (if == else).

./drivers/net/wireless/broadcom/b43/phy_n.c:4606:2-4: WARNING: possible condition with no effect (if == else).

---
 drivers/net/wireless/broadcom/b43/phy_n.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/net/wireless/broadcom/b43/phy_n.c +0 -17
index b669dff..39a335f 100644
@@ -4601,16 +4601,6 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
        if (nphy->hang_avoid)
                b43_nphy_stay_in_carrier_search(dev, 1);
 
-       if (nphy->gband_spurwar_en) {
-               /* TODO: N PHY Adjust Analog Pfbw (7) */
-               if (channel == 11 && b43_is_40mhz(dev)) {
-                       ; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/
-               } else {
-                       ; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
-               }
-               /* TODO: N PHY Adjust CRS Min Power (0x1E) */
-       }
-
        if (nphy->aband_spurwar_en) {
                if (channel == 54) {
                        tone[0] = 0x20;
@@ -4636,12 +4626,6 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
                        tone[0] = 0;
                        noise[0] = 0;
                }
-
-               if (!tone[0] && !noise[0]) {
-                       ; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/
-               } else {
-                       ; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
-               }
        }
 
        if (nphy->hang_avoid)
--

1.8.3.1

Signature · 4 lines
Julian Calaby

Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/