[PATCH 2/2] staging: vt6656: change unused int return value to void
From: John B. Wyatt IV
Date: Tue Mar 24 2020 - 02:46:19 EST
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@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: John B. Wyatt IV <jbwyatt4@xxxxxxxxx>
---
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