[PATCH 1/1] b43: phy_n: Delete some useless empty code

Subsystems: b43 wireless driver, the rest

STALE1911d

6 messages, 3 authors, 2021-05-11 · open the first message on its own page

[PATCH 1/1] b43: phy_n: Delete some useless empty code

From: Zhen Lei <hidden>
Date: 2021-05-10 14:54:19

These TODO empty code are added by
commit 9442e5b58edb ("b43: N-PHY: partly implement SPUR workaround"). It's
been more than a decade now. I don't think anyone who wants to perfect
this workaround can follow this TODO tip exactly. Instead, it limits them
to new thinking. Remove it will be better.

No functional change.

Signed-off-by: Zhen Lei <redacted>
---
 drivers/net/wireless/broadcom/b43/phy_n.c | 16 ----------------
 1 file changed, 16 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/phy_n.c b/drivers/net/wireless/broadcom/b43/phy_n.c
index 665b737fbb0d820..13cc62695f4cc93 100644
--- a/drivers/net/wireless/broadcom/b43/phy_n.c
+++ b/drivers/net/wireless/broadcom/b43/phy_n.c
@@ -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)
-- 
2.26.0.106.g9fadedd

Re: [PATCH 1/1] b43: phy_n: Delete some useless empty code

From: kernel test robot <hidden>
Date: 2021-05-10 17:22:54

Hi Zhen,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on wireless-drivers-next/master]
[also build test WARNING on wireless-drivers/master v5.13-rc1 next-20210510]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Zhen-Lei/b43-phy_n-Delete-some-useless-empty-code/20210510-225502
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: x86_64-randconfig-s022-20210510 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce:
        # apt-get install sparse
        # sparse version: v0.6.3-341-g8af24329-dirty
        # https://github.com/0day-ci/linux/commit/0a34ec34888436b132760d1f4f9aa7b0e8f84488
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Zhen-Lei/b43-phy_n-Delete-some-useless-empty-code/20210510-225502
        git checkout 0a34ec34888436b132760d1f4f9aa7b0e8f84488
        # save the attached .config to linux build tree
        make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' W=1 ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <redacted>

All warnings (new ones prefixed by >>):

   drivers/net/wireless/broadcom/b43/phy_n.c: In function 'b43_nphy_spur_workaround':
quoted
drivers/net/wireless/broadcom/b43/phy_n.c:4597:6: warning: variable 'noise' set but not used [-Wunused-but-set-variable]
    4597 |  u32 noise[2] = { 0x3FF, 0x3FF };
         |      ^~~~~
quoted
drivers/net/wireless/broadcom/b43/phy_n.c:4596:6: warning: variable 'tone' set but not used [-Wunused-but-set-variable]
    4596 |  int tone[2] = { 57, 58 };
         |      ^~~~


vim +/noise +4597 drivers/net/wireless/broadcom/b43/phy_n.c

90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4589  
2d96c1ed4bab52 drivers/net/wireless/broadcom/b43/phy_n.c Alexander A. Klimov 2020-07-19  4590  /* https://bcm-v4.sipsolutions.net/802.11/PHY/N/SpurWar */
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4591  static void b43_nphy_spur_workaround(struct b43_wldev *dev)
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4592  {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4593  	struct b43_phy_n *nphy = dev->phy.n;
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4594  
204a665ba390bc drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-10-14  4595  	u8 channel = dev->phy.channel;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04 @4596  	int tone[2] = { 57, 58 };
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04 @4597  	u32 noise[2] = { 0x3FF, 0x3FF };
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4598  
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4599  	B43_WARN_ON(dev->phy.rev < 3);
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4600  
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4601  	if (nphy->hang_avoid)
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4602  		b43_nphy_stay_in_carrier_search(dev, 1);
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4603  
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4604  	if (nphy->aband_spurwar_en) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4605  		if (channel == 54) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4606  			tone[0] = 0x20;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4607  			noise[0] = 0x25F;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4608  		} else if (channel == 38 || channel == 102 || channel == 118) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4609  			if (0 /* FIXME */) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4610  				tone[0] = 0x20;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4611  				noise[0] = 0x21F;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4612  			} else {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4613  				tone[0] = 0;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4614  				noise[0] = 0;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4615  			}
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4616  		} else if (channel == 134) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4617  			tone[0] = 0x20;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4618  			noise[0] = 0x21F;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4619  		} else if (channel == 151) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4620  			tone[0] = 0x10;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4621  			noise[0] = 0x23F;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4622  		} else if (channel == 153 || channel == 161) {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4623  			tone[0] = 0x30;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4624  			noise[0] = 0x23F;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4625  		} else {
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4626  			tone[0] = 0;
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4627  			noise[0] = 0;
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4628  		}
5ae6c8a696cdae drivers/net/wireless/broadcom/b43/phy_n.c Lee Jones           2020-08-14  4629  	}
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4630  
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4631  	if (nphy->hang_avoid)
9442e5b58edb4a drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-02-04  4632  		b43_nphy_stay_in_carrier_search(dev, 0);
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4633  }
90b9738d85395d drivers/net/wireless/b43/phy_n.c          Rafał Miłecki       2010-01-15  4634  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

Re: [PATCH 1/1] b43: phy_n: Delete some useless empty code

From: Andrew Lunn <andrew@lunn.ch>
Date: 2021-05-10 20:02:49

On Mon, May 10, 2021 at 10:51:17PM +0800, Zhen Lei wrote:
These TODO empty code are added by
commit 9442e5b58edb ("b43: N-PHY: partly implement SPUR workaround"). It's
been more than a decade now. I don't think anyone who wants to perfect
this workaround can follow this TODO tip exactly. Instead, it limits them
to new thinking. Remove it will be better.

No functional change.
No function change, apart from the new warning?

Does your bot to compile the change and look for new warnings/errors?

     Andrew

Re: [PATCH 1/1] b43: phy_n: Delete some useless empty code

From: Leizhen (ThunderTown) <hidden>
Date: 2021-05-11 01:11:37


On 2021/5/11 4:02, Andrew Lunn wrote:
On Mon, May 10, 2021 at 10:51:17PM +0800, Zhen Lei wrote:
quoted
These TODO empty code are added by
commit 9442e5b58edb ("b43: N-PHY: partly implement SPUR workaround"). It's
been more than a decade now. I don't think anyone who wants to perfect
this workaround can follow this TODO tip exactly. Instead, it limits them
to new thinking. Remove it will be better.

No functional change.
No function change, apart from the new warning?

Does your bot to compile the change and look for new warnings/errors?
Sorry, I have compiled it. I guess it's probably separated by macros, which I didn't notice. I will check it.
     Andrew

.

Re: [PATCH 1/1] b43: phy_n: Delete some useless empty code

From: Leizhen (ThunderTown) <hidden>
Date: 2021-05-11 03:00:16


On 2021/5/11 9:11, Leizhen (ThunderTown) wrote:

On 2021/5/11 4:02, Andrew Lunn wrote:
quoted
On Mon, May 10, 2021 at 10:51:17PM +0800, Zhen Lei wrote:
quoted
These TODO empty code are added by
commit 9442e5b58edb ("b43: N-PHY: partly implement SPUR workaround"). It's
been more than a decade now. I don't think anyone who wants to perfect
this workaround can follow this TODO tip exactly. Instead, it limits them
to new thinking. Remove it will be better.

No functional change.
No function change, apart from the new warning?

Does your bot to compile the change and look for new warnings/errors?
Sorry, I have compiled it. I guess it's probably separated by macros, which I didn't notice. I will check it.
I got it. It reported by W=1.
quoted
     Andrew

.

Re: [PATCH 1/1] b43: phy_n: Delete some useless empty code

From: Andrew Lunn <andrew@lunn.ch>
Date: 2021-05-11 12:04:50

I got it. It reported by W=1.
A lot of the kernel tree is W=1 clean now. Networking is. So we expect
patches to also be W=1 clean.

Hopefully this will become the default at some point, or the
additional warnings W=1 enables will be made always be enabled.

	   Andrew
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help