* [PATCH 1/2] staging: vt6656: remove unneeded variable: ret
2020-03-24 6:45 [PATCH 0/2] staging: vt6656: change function from always returning 0 to void John B. Wyatt IV
@ 2020-03-24 6:45 ` John B. Wyatt IV
2020-03-24 10:03 ` Quentin Deslandes
2020-03-24 6:45 ` [PATCH 2/2] staging: vt6656: change unused int return value to void John B. Wyatt IV
2020-03-24 17:28 ` [PATCH 0/2] staging: vt6656: change function from always returning 0 " Dan Carpenter
2 siblings, 1 reply; 5+ messages in thread
From: John B. Wyatt IV @ 2020-03-24 6:45 UTC (permalink / raw)
To: outreachy-kernel, Julia Lawall, Forest Bond, Greg Kroah-Hartman,
Quentin Deslandes, Colin Ian King, Malcolm Priestley,
Oscar Carter, devel, linux-kernel
Cc: John B. Wyatt IV
Remove unneeded variable ret; replace with 0 for the return value.
Update function documentation (comment) on the return status as
suggested by Julia Lawall <julia.lawall@inria.fr>.
Issue reported by coccinelle (coccicheck).
Signed-off-by: John B. Wyatt IV <jbwyatt4@gmail.com>
---
drivers/staging/vt6656/card.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index dc3ab10eb630..05b57a2489a0 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -716,13 +716,11 @@ int vnt_radio_power_off(struct vnt_private *priv)
* Out:
* none
*
- * Return Value: true if success; otherwise false
+ * Return Value: 0
*
*/
int vnt_radio_power_on(struct vnt_private *priv)
{
- int ret = 0;
-
vnt_exit_deep_sleep(priv);
vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
@@ -741,7 +739,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
- return ret;
+ return 0;
}
void vnt_set_bss_mode(struct vnt_private *priv)
--
2.25.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] staging: vt6656: remove unneeded variable: ret
2020-03-24 6:45 ` [PATCH 1/2] staging: vt6656: remove unneeded variable: ret John B. Wyatt IV
@ 2020-03-24 10:03 ` Quentin Deslandes
0 siblings, 0 replies; 5+ messages in thread
From: Quentin Deslandes @ 2020-03-24 10:03 UTC (permalink / raw)
To: John B. Wyatt IV
Cc: devel, Oscar Carter, Malcolm Priestley, Greg Kroah-Hartman,
linux-kernel, Julia Lawall, outreachy-kernel, Forest Bond,
Colin Ian King
On 03/23/20 23:45:44, John B. Wyatt IV wrote:
> vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
This function, and all the functions called in vnt_radio_power_on() returns
a value, why don't you catch it and act accordingly (forward error code
for example) instead of silencing it?
Thanks,
Quentin
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] staging: vt6656: change unused int return value to void
2020-03-24 6:45 [PATCH 0/2] staging: vt6656: change function from always returning 0 to void John B. Wyatt IV
2020-03-24 6:45 ` [PATCH 1/2] staging: vt6656: remove unneeded variable: ret John B. Wyatt IV
@ 2020-03-24 6:45 ` John B. Wyatt IV
2020-03-24 17:28 ` [PATCH 0/2] staging: vt6656: change function from always returning 0 " Dan Carpenter
2 siblings, 0 replies; 5+ messages in thread
From: John B. Wyatt IV @ 2020-03-24 6:45 UTC (permalink / raw)
To: outreachy-kernel, Julia Lawall, Forest Bond, Greg Kroah-Hartman,
Quentin Deslandes, Colin Ian King, Malcolm Priestley,
Oscar Carter, devel, linux-kernel
Cc: John B. Wyatt IV
Change unused int function return value to void from previous patch.
Update function documentation to remove mention of return value.
Remove if statement check of the only usage of function in the
kernel. Replace with calling the function.
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John B. Wyatt IV <jbwyatt4@gmail.com>
---
drivers/staging/vt6656/card.c | 7 ++-----
drivers/staging/vt6656/card.h | 2 +-
drivers/staging/vt6656/main_usb.c | 4 +---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 05b57a2489a0..4be7fca32796 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -715,11 +715,8 @@ int vnt_radio_power_off(struct vnt_private *priv)
* priv - The adapter to be turned on
* Out:
* none
- *
- * Return Value: 0
- *
*/
-int vnt_radio_power_on(struct vnt_private *priv)
+void vnt_radio_power_on(struct vnt_private *priv)
{
vnt_exit_deep_sleep(priv);
@@ -739,7 +736,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
- return 0;
+ return;
}
void vnt_set_bss_mode(struct vnt_private *priv)
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 75cd340c0cce..fcab6b086e71 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -40,7 +40,7 @@ void vnt_update_next_tbtt(struct vnt_private *priv, u64 tsf,
u64 vnt_get_next_tbtt(u64 tsf, u16 beacon_interval);
u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2);
int vnt_radio_power_off(struct vnt_private *priv);
-int vnt_radio_power_on(struct vnt_private *priv);
+void vnt_radio_power_on(struct vnt_private *priv);
u8 vnt_get_pkt_type(struct vnt_private *priv);
void vnt_set_bss_mode(struct vnt_private *priv);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 8e7269c87ea9..8214427f5ee3 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -370,9 +370,7 @@ static int vnt_init_registers(struct vnt_private *priv)
if (ret)
goto end;
- ret = vnt_radio_power_on(priv);
- if (ret)
- goto end;
+ vnt_radio_power_on(priv);
dev_dbg(&priv->usb->dev, "<----INIbInitAdapter Exit\n");
--
2.25.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] staging: vt6656: change function from always returning 0 to void
2020-03-24 6:45 [PATCH 0/2] staging: vt6656: change function from always returning 0 to void John B. Wyatt IV
2020-03-24 6:45 ` [PATCH 1/2] staging: vt6656: remove unneeded variable: ret John B. Wyatt IV
2020-03-24 6:45 ` [PATCH 2/2] staging: vt6656: change unused int return value to void John B. Wyatt IV
@ 2020-03-24 17:28 ` Dan Carpenter
2 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2020-03-24 17:28 UTC (permalink / raw)
To: John B. Wyatt IV
Cc: devel, Oscar Carter, Malcolm Priestley, Greg Kroah-Hartman,
linux-kernel, Julia Lawall, outreachy-kernel, Forest Bond,
Colin Ian King
Fold these two patches together so its just one patch.
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 5+ messages in thread