Commit 5ae6c8a6 authored by Lee Jones's avatar Lee Jones Committed by Kalle Valo

b43: phy_n: Add empty braces around empty statements

Fixes the following W=1 kernel build warning(s):

 drivers/net/wireless/broadcom/b43/phy_n.c: In function ‘b43_nphy_workarounds_rev3plus’:
 drivers/net/wireless/broadcom/b43/phy_n.c:3346:3: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
 drivers/net/wireless/broadcom/b43/phy_n.c: In function ‘b43_nphy_spur_workaround’:
 drivers/net/wireless/broadcom/b43/phy_n.c:4608:4: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
 drivers/net/wireless/broadcom/b43/phy_n.c:4641:4: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
 drivers/net/wireless/broadcom/b43/phy_n.c: In function ‘b43_phy_initn’:
 drivers/net/wireless/broadcom/b43/phy_n.c:6170:3: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
 drivers/net/wireless/broadcom/b43/phy_n.c:6215:5: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]

Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
Cc: Michael Buesch <m@bues.ch>
Cc: linux-wireless@vger.kernel.org
Cc: b43-dev@lists.infradead.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200814113933.1903438-31-lee.jones@linaro.org
parent c171304b
...@@ -3342,8 +3342,9 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev) ...@@ -3342,8 +3342,9 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH0, 0x0381); b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH0, 0x0381);
b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH1, 0x0381); b43_phy_write(dev, B43_NPHY_ED_CRS20UDEASSERTTHRESH1, 0x0381);
if (dev->phy.rev >= 6 && sprom->boardflags2_lo & B43_BFL2_SINGLEANT_CCK) if (dev->phy.rev >= 6 && sprom->boardflags2_lo & B43_BFL2_SINGLEANT_CCK) {
; /* TODO: 0x0080000000000000 HF */ ; /* TODO: 0x0080000000000000 HF */
}
} }
static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev) static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
...@@ -4602,10 +4603,11 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev) ...@@ -4602,10 +4603,11 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
if (nphy->gband_spurwar_en) { if (nphy->gband_spurwar_en) {
/* TODO: N PHY Adjust Analog Pfbw (7) */ /* TODO: N PHY Adjust Analog Pfbw (7) */
if (channel == 11 && b43_is_40mhz(dev)) if (channel == 11 && b43_is_40mhz(dev)) {
; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/ ; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/
else } else {
; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/ ; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
}
/* TODO: N PHY Adjust CRS Min Power (0x1E) */ /* TODO: N PHY Adjust CRS Min Power (0x1E) */
} }
...@@ -4635,11 +4637,12 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev) ...@@ -4635,11 +4637,12 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)
noise[0] = 0; noise[0] = 0;
} }
if (!tone[0] && !noise[0]) if (!tone[0] && !noise[0]) {
; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/ ; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/
else } else {
; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/ ; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/
} }
}
if (nphy->hang_avoid) if (nphy->hang_avoid)
b43_nphy_stay_in_carrier_search(dev, 0); b43_nphy_stay_in_carrier_search(dev, 0);
...@@ -6166,8 +6169,9 @@ static int b43_phy_initn(struct b43_wldev *dev) ...@@ -6166,8 +6169,9 @@ static int b43_phy_initn(struct b43_wldev *dev)
if (nphy->phyrxchain != 3) if (nphy->phyrxchain != 3)
b43_nphy_set_rx_core_state(dev, nphy->phyrxchain); b43_nphy_set_rx_core_state(dev, nphy->phyrxchain);
if (nphy->mphase_cal_phase_id > 0) if (nphy->mphase_cal_phase_id > 0) {
;/* TODO PHY Periodic Calibration Multi-Phase Restart */ ;/* TODO PHY Periodic Calibration Multi-Phase Restart */
}
do_rssi_cal = false; do_rssi_cal = false;
if (phy->rev >= 3) { if (phy->rev >= 3) {
...@@ -6211,8 +6215,9 @@ static int b43_phy_initn(struct b43_wldev *dev) ...@@ -6211,8 +6215,9 @@ static int b43_phy_initn(struct b43_wldev *dev)
if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false)) if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false))
if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0) if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0)
b43_nphy_save_cal(dev); b43_nphy_save_cal(dev);
} else if (nphy->mphase_cal_phase_id == 0) } else if (nphy->mphase_cal_phase_id == 0) {
;/* N PHY Periodic Calibration with arg 3 */ ;/* N PHY Periodic Calibration with arg 3 */
}
} else { } else {
b43_nphy_restore_cal(dev); b43_nphy_restore_cal(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment