staging: vt6656: add error code handling to unused variable
PATCH v6 1/1 staging: vt6656: add error code handling to unused variable
Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within vnt_radio_power_on.
Issue reported by coccinelle (coccicheck).
---
v6: Forgot to add all the v5 code to commit.
v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch. Suggested by Stefano Brivio <[email protected]>
v4: Move Suggested-by: Julia Lawall above seperator line.
Add Reviewed-by tag as requested by Quentin Deslandes.
v3: Forgot to add v2 code changes to commit.
v2: Replace goto statements with return.
Remove last if check because it was unneeded.
drivers/staging/vt6656/card.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/staging/vt6656/card.c +12 -8
@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ; -vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) +return ret; -vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); +if (ret) +return ret;switch (priv->rf_type) {case RF_AL2230 :
@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :case RF_VT3342A0 : -vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 )); -break ; + ret =vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , + (SOFTPWRCTL_SWPE2 | +SOFTPWRCTL_SWPE3 )); } +if (ret) +return ret; -vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); - -return ret; +return vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); }void vnt_set_bss_mode (struct vnt_private *priv)
Signature · 1 line
2.25.1
Quoted 52 lines · On Mon, 30 Mar 2020 14:46:13 -0700 "John B. Wyatt IV" <[email protected]>…
Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within
vnt_radio_power_on.Issue reported by coccinelle (coccicheck).
Suggested-by Quentin Deslandes <[email protected]>Suggested-by Stefano Brivio <[email protected]>Reviewed-by Quentin Deslandes <[email protected]>Signed-off-by John B. Wyatt IV <[email protected]>---
v6: Forgot to add all the v5 code to commit.v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch. Suggested by Stefano Brivio <[email protected]>v4: Move Suggested-by: Julia Lawall above seperator line.
Add Reviewed-by tag as requested by Quentin Deslandes.v3: Forgot to add v2 code changes to commit.
v2: Replace goto statements with return.
Remove last if check because it was unneeded.Suggested-by Julia Lawall <[email protected]>drivers/staging/vt6656/card.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)drivers/staging/vt6656/card.c +6
-2@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ; -vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) +return ret; -vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); +if (ret) +return ret;switch (priv->rf_type) {case RF_AL2230 :@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 746
Quoted 10 lines
drivers/staging/vt6656/card.c +5
-3case RF_VT3342A0 : -vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 )); -break ; + ret =vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , + (SOFTPWRCTL_SWPE2 | +SOFTPWRCTL_SWPE3 )); } +if (ret) +return ret;
Hmm, sorry, I haven't been clear enough I guess.
This is what you're doing:
if rf_type is not in that list:
- set some bits in a register
- did it fail? return
- did it fail? return
...
if rf_type is in that list:
- set some bits in a register
- did it fail? return
- set some other bits
- did it fail? return
...
Now, the "set some other bits" part is already selected depending on rf_type. There's no need to check 'ret' otherwise, so you can move the return just after setting 'ret', in the switch case.
With a check, because you don't want to return if ret == 0.
Signature · 1 line
Stefano
Quoted 89 lines · Stefano Brivio
Quoted 58 lines · On Mon, 30 Mar 2020 14:46:13 -0700 "John B. Wyatt IV" <[email protected]>…
Add error code handling to unused 'ret' variable that was never used.
Return an error code from functions called withinvnt_radio_power_on.Issue reported by coccinelle (coccicheck).
Suggested-by Quentin Deslandes <[email protected]>Suggested-by Stefano Brivio <[email protected]>Reviewed-by Quentin Deslandes <[email protected]>Signed-off-by John B. Wyatt IV <[email protected]>---
v6: Forgot to add all the v5 code to commit.v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch. Suggested by Stefano Brivio <[email protected]>v4: Move Suggested-by: Julia Lawall above seperator line.
Add Reviewed-by tag as requested by Quentin Deslandes.v3: Forgot to add v2 code changes to commit.
v2: Replace goto statements with return.
Remove last if check because it was unneeded.Suggested-by Julia Lawall <[email protected]>drivers/staging/vt6656/card.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)drivers/staging/vt6656/card.c +6
-2@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ; -vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) +return ret; -vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); +if (ret) +return ret;switch (priv->rf_type) {drivers/staging/vt6656/card.c +0
-0case RF_AL2230 :@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :case RF_VT3342A0 :drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private · line 748
Quoted 10 lines
drivers/staging/vt6656/card.c +5
-3-vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); -break ; + ret =vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , + (SOFTPWRCTL_SWPE2 | +SOFTPWRCTL_SWPE3 )); } +if (ret) +return ret;Hmm, sorry, I haven't been clear enough I guess.
This is what you're doing:
if
rf_typeis not in that list:
- set some bits in a register
- did it fail? return
- did it fail? return
...if
rf_typeis in that list:
- set some bits in a register
- did it fail? return
- set some other bits
- did it fail? return
...
Quoted 5 lines
Now, the "set some other bits" part is already selected depending on
rf_type. There's no need to check 'ret' otherwise, so you can move the
return just after setting 'ret', in the switch case.
Thank you for pointing that out Stefano. That would be a serious issue with logic.
Just to be sure. Are you looking for this?
switch (priv->rf_type) {
case RF_AL2230:
case RF_AL2230S:
case RF_AIROHA7230:
case RF_VT3226:
case RF_VT3226D0:
case RF_VT3342A0:
ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); if (ret) return ret; }
Quoted 2 lines
With a check, because you don't want to return if ret == 0.
What do you mean exactly by this?
The new code should only return a 0 at the end of the function with the vnt_mac_reg_bits_off call.
Quoted 108 lines · On Mon, 30 Mar 2020 15:26:04 -0700 "John B. Wyatt IV" <[email protected]>…
Quoted 89 lines · Stefano Brivio
Quoted 58 lines · On Mon, 30 Mar 2020 14:46:13 -0700 "John B. Wyatt IV" <[email protected]>…
Add error code handling to unused 'ret' variable that was never used.
Return an error code from functions called withinvnt_radio_power_on.Issue reported by coccinelle (coccicheck).
Suggested-by Quentin Deslandes <[email protected]>Suggested-by Stefano Brivio <[email protected]>Reviewed-by Quentin Deslandes <[email protected]>Signed-off-by John B. Wyatt IV <[email protected]>---
v6: Forgot to add all the v5 code to commit.v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch. Suggested by Stefano Brivio <[email protected]>v4: Move Suggested-by: Julia Lawall above seperator line.
Add Reviewed-by tag as requested by Quentin Deslandes.v3: Forgot to add v2 code changes to commit.
v2: Replace goto statements with return.
Remove last if check because it was unneeded.Suggested-by Julia Lawall <[email protected]>drivers/staging/vt6656/card.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)drivers/staging/vt6656/card.c +6
-2@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ; -vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) +return ret; -vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); + ret =vnt_mac_reg_bits_on (priv,MAC_REG_HOSTCR ,HOSTCR_RXON ); +if (ret) +return ret;switch (priv->rf_type) {drivers/staging/vt6656/card.c +0
-0case RF_AL2230 :@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :case RF_VT3342A0 :drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private · line 748
Quoted 10 lines
drivers/staging/vt6656/card.c +5
-3-vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); -break ; + ret =vnt_mac_reg_bits_on (priv,MAC_REG_SOFTPWRCTL , + (SOFTPWRCTL_SWPE2 | +SOFTPWRCTL_SWPE3 )); } +if (ret) +return ret;Hmm, sorry, I haven't been clear enough I guess.
This is what you're doing:
if
rf_typeis not in that list:
- set some bits in a register
- did it fail? return
- did it fail? return
...if
rf_typeis in that list:
- set some bits in a register
- did it fail? return
- set some other bits
- did it fail? return
...Quoted 5 lines
Now, the "set some other bits" part is already selected depending on
rf_type. There's no need to check 'ret' otherwise, so you can move the
return just after setting 'ret', in the switch case.Thank you for pointing that out Stefano. That would be a serious issue with logic.
Just to be sure. Are you looking for this?
switch (
priv->rf_type) {
caseRF_AL2230:
caseRF_AL2230S:
caseRF_AIROHA7230:
caseRF_VT3226:
caseRF_VT3226D0:
caseRF_VT3342A0:
Quoted 6 lines
ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); if (ret) return ret; }
Exactly.
Quoted 4 lines
Quoted 2 lines
With a check, because you don't want to return if ret == 0.
What do you mean exactly by this?
Exactly what you wrote above: if (ret) ...
Quoted 2 lines
The new code should only return a 0 at the end of the function with the
vnt_mac_reg_bits_offcall.
That, or an error code if vnt_mac_reg_bits_off() fails.
Signature · 1 line
Stefano