linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] staging: r8188eu: remove unneeded ret variables
@ 2022-01-06 17:41 Abdun Nihaal
  2022-01-06 17:41 ` [PATCH v2 1/2] " Abdun Nihaal
  2022-01-06 17:41 ` [PATCH v2 2/2] staging: r8188eu: change functions to return void Abdun Nihaal
  0 siblings, 2 replies; 7+ messages in thread
From: Abdun Nihaal @ 2022-01-06 17:41 UTC (permalink / raw)
  To: gregkh
  Cc: Abdun Nihaal, Larry.Finger, phil, straube.linux, martin,
	linux-staging, linux-kernel

This patchset removes unneeded return variables in ioctl_linux.c,
and also converts functions that always return 0 to return void.

v1 -> v2:

- As suggested by Greg, change functions that always return 0
  and whose return value is not used, to return void instead.
- Not removing return variables in rtw_p2p_get2 and rtw_p2p_set
  as they may need to be used.
  These functions call other functions that do return error codes
  (mostly -1 and -EFAULT) but are not propagated back.
  I'll send a different patch to fix that.

Abdun Nihaal (2):
  staging: r8188eu: remove unneeded ret variables
  staging: r8188eu: change functions to return void

 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 156 ++++++++-----------
 1 file changed, 68 insertions(+), 88 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 1/2] staging: r8188eu: remove unneeded ret variables
  2022-01-06 17:41 [PATCH v2 0/2] staging: r8188eu: remove unneeded ret variables Abdun Nihaal
@ 2022-01-06 17:41 ` Abdun Nihaal
  2022-01-06 17:41 ` [PATCH v2 2/2] staging: r8188eu: change functions to return void Abdun Nihaal
  1 sibling, 0 replies; 7+ messages in thread
From: Abdun Nihaal @ 2022-01-06 17:41 UTC (permalink / raw)
  To: gregkh
  Cc: Abdun Nihaal, Larry.Finger, phil, straube.linux, martin,
	linux-staging, linux-kernel

Remove unneeded return variables in ioctl_linux.c that are initialized
to 0 and are not assigned after. Instead, return 0 directly.

Found using coccinelle (returnvar.cocci).

Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
v1 -> v2:
Not removing unneeded return variable in rtw_p2p_get2 and rtw_p2p_set
because they have to be used.

 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 79 +++++++-------------
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index 67a8af79508f..6d8adbee85f3 100644
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -1383,7 +1383,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
 			      struct iw_request_info *a,
 			      union iwreq_data *wrqu, char *extra)
 {
-	u32 len, ret = 0;
+	u32 len;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;
 	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;
@@ -1399,7 +1399,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
 	wrqu->essid.length = len;
 	wrqu->essid.flags = 1;
 
-	return ret;
+	return 0;
 }
 
 static int rtw_wx_set_rate(struct net_device *dev,
@@ -1717,7 +1717,7 @@ static int rtw_wx_get_enc(struct net_device *dev,
 			    struct iw_request_info *info,
 			    union iwreq_data *wrqu, char *keybuf)
 {
-	uint key, ret = 0;
+	uint key;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct iw_point *erq = &wrqu->encoding;
 	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;
@@ -1778,7 +1778,7 @@ static int rtw_wx_get_enc(struct net_device *dev,
 	}
 
 
-	return ret;
+	return 0;
 }
 
 static int rtw_wx_get_power(struct net_device *dev,
@@ -2312,7 +2312,6 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2320,7 +2319,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
 	memcpy(pwdinfo->nego_ssid, extra, strlen(extra));
 	pwdinfo->nego_ssidlen = strlen(extra);
 
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_set_intent(struct net_device *dev,
@@ -2460,7 +2459,6 @@ static int rtw_p2p_setDN(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2469,14 +2467,13 @@ static int rtw_p2p_setDN(struct net_device *dev,
 	memcpy(pwdinfo->device_name, extra, wrqu->data.length - 1);
 	pwdinfo->device_name_len = wrqu->data.length - 1;
 
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_status(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2491,7 +2488,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
 	sprintf(extra, "\n\nStatus =%.2d\n", rtw_p2p_state(pwdinfo));
 	wrqu->data.length = strlen(extra);
 
-	return ret;
+	return 0;
 }
 
 /*	Commented by Albert 20110520 */
@@ -2503,20 +2500,18 @@ static int rtw_p2p_get_req_cm(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
 	sprintf(extra, "\n\nCM =%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_role(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2526,14 +2521,13 @@ static int rtw_p2p_get_role(struct net_device *dev,
 
 	sprintf(extra, "\n\nRole =%.2d\n", rtw_p2p_role(pwdinfo));
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2543,7 +2537,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
 	sprintf(extra, "\nMAC %pM",
 		pwdinfo->p2p_peer_interface_addr);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
@@ -2551,7 +2545,6 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
 			       union iwreq_data *wrqu, char *extra)
 
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2561,7 +2554,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
 	sprintf(extra, "\n%pM",
 		pwdinfo->rx_prov_disc_info.peerDevAddr);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
@@ -2569,7 +2562,6 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
 			       union iwreq_data *wrqu, char *extra)
 
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2579,7 +2571,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
 	sprintf(extra, "\nMAC %pM",
 		pwdinfo->p2p_peer_device_addr);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_groupid(struct net_device *dev,
@@ -2587,7 +2579,6 @@ static int rtw_p2p_get_groupid(struct net_device *dev,
 			       union iwreq_data *wrqu, char *extra)
 
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2597,7 +2588,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev,
 		pwdinfo->groupid_info.go_device_addr[4], pwdinfo->groupid_info.go_device_addr[5],
 		pwdinfo->groupid_info.ssid);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_op_ch(struct net_device *dev,
@@ -2605,7 +2596,6 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
 			       union iwreq_data *wrqu, char *extra)
 
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -2613,14 +2603,13 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
 
 	sprintf(extra, "\n\nOp_ch =%.2d\n", pwdinfo->operating_channel);
 	wrqu->data.length = strlen(extra);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	u8 peerMAC[ETH_ALEN] = {0x00};
 	int jj, kk;
@@ -2681,14 +2670,13 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
 
 	if (copy_to_user(wrqu->data.pointer, attr_content_str, 6 + 17))
 		return -EFAULT;
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_go_device_address(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	u8 peerMAC[ETH_ALEN] = {0x00};
 	int jj, kk;
@@ -2764,14 +2752,13 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
 
 	if (copy_to_user(wrqu->data.pointer, go_devadd_str, 10 + 17))
 		return -EFAULT;
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_device_type(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	u8 peerMAC[ETH_ALEN] = {0x00};
 	int jj, kk;
@@ -2840,14 +2827,13 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
 		return -EFAULT;
 	}
 
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_device_name(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	u8 peerMAC[ETH_ALEN] = {0x00};
 	int jj, kk;
@@ -2906,14 +2892,13 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
 
 	if (copy_to_user(wrqu->data.pointer, dev_name_str, 5 + ((dev_len > 17) ? dev_len : 17)))
 		return -EFAULT;
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	u8 peerMAC[ETH_ALEN] = {0x00};
 	int jj, kk;
@@ -2982,7 +2967,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
 	}
 	if (copy_to_user(wrqu->data.pointer, inv_proc_str, 8 + 17))
 		return -EFAULT;
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_connect(struct net_device *dev,
@@ -3068,7 +3053,6 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 			      struct iw_request_info *info,
 			      union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 	int jj, kk;
@@ -3092,12 +3076,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 
 	if (wrqu->data.length <=  37) {
 		DBG_88E("[%s] Wrong format!\n", __func__);
-		return ret;
+		return 0;
 	}
 
 	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return ret;
+		return 0;
 	} else {
 		/*	Reset the content of struct tx_invite_req_info */
 		pinvite_req_info->benable = false;
@@ -3170,14 +3154,13 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 	} else {
 		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
 	}
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_set_persistent(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -3189,7 +3172,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
 
 	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return ret;
+		return 0;
 	} else {
 		if (extra[0] == '0')	/*	Disable the persistent group function. */
 			pwdinfo->persistent_supported = false;
@@ -3199,14 +3182,13 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
 			pwdinfo->persistent_supported = false;
 	}
 	pr_info("[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported);
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_prov_disc(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 	u8 peerMAC[ETH_ALEN] = {0x00};
@@ -3232,7 +3214,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 
 	if (pwdinfo->p2p_state == P2P_STATE_NONE) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return ret;
+		return 0;
 	} else {
 		/*	Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */
 		memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
@@ -3256,7 +3238,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 		pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL;
 	} else {
 		DBG_88E("[%s] Unknown WPS config methodn", __func__);
-		return ret;
+		return 0;
 	}
 
 	spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -3328,7 +3310,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 	} else {
 		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
 	}
-	return ret;
+	return 0;
 }
 
 /*	This function is used to inform the driver the user had specified the pin code value or pbc */
@@ -3338,7 +3320,6 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
 
@@ -3359,7 +3340,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
 		pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_PBC;
 	else
 		pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO;
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_set(struct net_device *dev,
@@ -3422,8 +3403,6 @@ static int rtw_p2p_get(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
-
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 
 	if (padapter->bShowGetP2PState)
@@ -3447,7 +3426,7 @@ static int rtw_p2p_get(struct net_device *dev,
 	} else if (!memcmp(wrqu->data.pointer, "op_ch", 5)) {
 		rtw_p2p_get_op_ch(dev, info, wrqu, extra);
 	}
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get2(struct net_device *dev,
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v2 2/2] staging: r8188eu: change functions to return void
  2022-01-06 17:41 [PATCH v2 0/2] staging: r8188eu: remove unneeded ret variables Abdun Nihaal
  2022-01-06 17:41 ` [PATCH v2 1/2] " Abdun Nihaal
@ 2022-01-06 17:41 ` Abdun Nihaal
  2022-01-06 17:58   ` Greg KH
  1 sibling, 1 reply; 7+ messages in thread
From: Abdun Nihaal @ 2022-01-06 17:41 UTC (permalink / raw)
  To: gregkh
  Cc: Abdun Nihaal, Larry.Finger, phil, straube.linux, martin,
	linux-staging, linux-kernel

Some functions in ioctl_linux.c always returns 0 and their return values
are never used. Change return type of such functions to void.

While at it, align function arguments with open parenthesis to fix
checkpatch checks.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 115 ++++++++++---------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index 6d8adbee85f3..08914b246380 100644
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -2308,9 +2308,9 @@ static int rtw_wext_p2p_enable(struct net_device *dev,
 	return ret;
 }
 
-static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_set_go_nego_ssid(struct net_device *dev,
+				     struct iw_request_info *info,
+				     union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -2319,7 +2319,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
 	memcpy(pwdinfo->nego_ssid, extra, strlen(extra));
 	pwdinfo->nego_ssidlen = strlen(extra);
 
-	return 0;
+	return;
 }
 
 static int rtw_p2p_set_intent(struct net_device *dev,
@@ -2455,9 +2455,9 @@ static int rtw_p2p_profilefound(struct net_device *dev,
 	return ret;
 }
 
-static int rtw_p2p_setDN(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_setDN(struct net_device *dev,
+			  struct iw_request_info *info,
+			  union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -2467,10 +2467,10 @@ static int rtw_p2p_setDN(struct net_device *dev,
 	memcpy(pwdinfo->device_name, extra, wrqu->data.length - 1);
 	pwdinfo->device_name_len = wrqu->data.length - 1;
 
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_status(struct net_device *dev,
+static void rtw_p2p_get_status(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
@@ -2488,7 +2488,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
 	sprintf(extra, "\n\nStatus =%.2d\n", rtw_p2p_state(pwdinfo));
 	wrqu->data.length = strlen(extra);
 
-	return 0;
+	return;
 }
 
 /*	Commented by Albert 20110520 */
@@ -2496,7 +2496,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
 /*	This config method description will show us which config method the remote P2P device is intended to use */
 /*	by sending the provisioning discovery request frame. */
 
-static int rtw_p2p_get_req_cm(struct net_device *dev,
+static void rtw_p2p_get_req_cm(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
@@ -2505,12 +2505,12 @@ static int rtw_p2p_get_req_cm(struct net_device *dev,
 
 	sprintf(extra, "\n\nCM =%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_role(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_role(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -2521,12 +2521,12 @@ static int rtw_p2p_get_role(struct net_device *dev,
 
 	sprintf(extra, "\n\nRole =%.2d\n", rtw_p2p_role(pwdinfo));
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_peer_ifaddr(struct net_device *dev,
+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -2537,12 +2537,12 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
 	sprintf(extra, "\nMAC %pM",
 		pwdinfo->p2p_peer_interface_addr);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_peer_devaddr(struct net_device *dev,
+				     struct iw_request_info *info,
+				     union iwreq_data *wrqu, char *extra)
 
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -2554,12 +2554,13 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
 	sprintf(extra, "\n%pM",
 		pwdinfo->rx_prov_disc_info.peerDevAddr);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
+						   struct iw_request_info *info,
+						   union iwreq_data *wrqu,
+						   char *extra)
 
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -2571,12 +2572,12 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
 	sprintf(extra, "\nMAC %pM",
 		pwdinfo->p2p_peer_device_addr);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_groupid(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_groupid(struct net_device *dev,
+				struct iw_request_info *info,
+				union iwreq_data *wrqu, char *extra)
 
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -2588,12 +2589,12 @@ static int rtw_p2p_get_groupid(struct net_device *dev,
 		pwdinfo->groupid_info.go_device_addr[4], pwdinfo->groupid_info.go_device_addr[5],
 		pwdinfo->groupid_info.ssid);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_get_op_ch(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_get_op_ch(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
 
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@@ -2603,7 +2604,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
 
 	sprintf(extra, "\n\nOp_ch =%.2d\n", pwdinfo->operating_channel);
 	wrqu->data.length = strlen(extra);
-	return 0;
+	return;
 }
 
 static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
@@ -3049,9 +3050,9 @@ static int rtw_p2p_connect(struct net_device *dev,
 	return ret;
 }
 
-static int rtw_p2p_invite_req(struct net_device *dev,
-			      struct iw_request_info *info,
-			      union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_invite_req(struct net_device *dev,
+			       struct iw_request_info *info,
+			       union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -3076,12 +3077,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 
 	if (wrqu->data.length <=  37) {
 		DBG_88E("[%s] Wrong format!\n", __func__);
-		return 0;
+		return;
 	}
 
 	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return 0;
+		return;
 	} else {
 		/*	Reset the content of struct tx_invite_req_info */
 		pinvite_req_info->benable = false;
@@ -3154,12 +3155,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 	} else {
 		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
 	}
-	return 0;
+	return;
 }
 
-static int rtw_p2p_set_persistent(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_set_persistent(struct net_device *dev,
+				   struct iw_request_info *info,
+				   union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -3172,7 +3173,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
 
 	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return 0;
+		return;
 	} else {
 		if (extra[0] == '0')	/*	Disable the persistent group function. */
 			pwdinfo->persistent_supported = false;
@@ -3182,12 +3183,12 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
 			pwdinfo->persistent_supported = false;
 	}
 	pr_info("[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported);
-	return 0;
+	return;
 }
 
-static int rtw_p2p_prov_disc(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_prov_disc(struct net_device *dev,
+			      struct iw_request_info *info,
+			      union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -3214,7 +3215,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 
 	if (pwdinfo->p2p_state == P2P_STATE_NONE) {
 		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
-		return 0;
+		return;
 	} else {
 		/*	Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */
 		memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
@@ -3238,7 +3239,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 		pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL;
 	} else {
 		DBG_88E("[%s] Unknown WPS config methodn", __func__);
-		return 0;
+		return;
 	}
 
 	spin_lock_bh(&pmlmepriv->scanned_queue.lock);
@@ -3310,15 +3311,15 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 	} else {
 		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
 	}
-	return 0;
+	return;
 }
 
 /*	This function is used to inform the driver the user had specified the pin code value or pbc */
 /*	to application. */
 
-static int rtw_p2p_got_wpsinfo(struct net_device *dev,
-			       struct iw_request_info *info,
-			       union iwreq_data *wrqu, char *extra)
+static void rtw_p2p_got_wpsinfo(struct net_device *dev,
+				struct iw_request_info *info,
+				union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@@ -3340,7 +3341,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
 		pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_PBC;
 	else
 		pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO;
-	return 0;
+	return;
 }
 
 static int rtw_p2p_set(struct net_device *dev,
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] staging: r8188eu: change functions to return void
  2022-01-06 17:41 ` [PATCH v2 2/2] staging: r8188eu: change functions to return void Abdun Nihaal
@ 2022-01-06 17:58   ` Greg KH
  2022-01-07  6:52     ` Abdun Nihaal
  0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2022-01-06 17:58 UTC (permalink / raw)
  To: Abdun Nihaal
  Cc: Larry.Finger, phil, straube.linux, martin, linux-staging, linux-kernel

On Thu, Jan 06, 2022 at 11:11:52PM +0530, Abdun Nihaal wrote:
> Some functions in ioctl_linux.c always returns 0 and their return values
> are never used. Change return type of such functions to void.
> 
> While at it, align function arguments with open parenthesis to fix
> checkpatch checks.
> 
> Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
> ---
>  drivers/staging/r8188eu/os_dep/ioctl_linux.c | 115 ++++++++++---------
>  1 file changed, 58 insertions(+), 57 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> index 6d8adbee85f3..08914b246380 100644
> --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
> @@ -2308,9 +2308,9 @@ static int rtw_wext_p2p_enable(struct net_device *dev,
>  	return ret;
>  }
>  
> -static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_set_go_nego_ssid(struct net_device *dev,
> +				     struct iw_request_info *info,
> +				     union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -2319,7 +2319,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
>  	memcpy(pwdinfo->nego_ssid, extra, strlen(extra));
>  	pwdinfo->nego_ssidlen = strlen(extra);
>  
> -	return 0;
> +	return;
>  }
>  
>  static int rtw_p2p_set_intent(struct net_device *dev,
> @@ -2455,9 +2455,9 @@ static int rtw_p2p_profilefound(struct net_device *dev,
>  	return ret;
>  }
>  
> -static int rtw_p2p_setDN(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_setDN(struct net_device *dev,
> +			  struct iw_request_info *info,
> +			  union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -2467,10 +2467,10 @@ static int rtw_p2p_setDN(struct net_device *dev,
>  	memcpy(pwdinfo->device_name, extra, wrqu->data.length - 1);
>  	pwdinfo->device_name_len = wrqu->data.length - 1;
>  
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_status(struct net_device *dev,
> +static void rtw_p2p_get_status(struct net_device *dev,
>  			       struct iw_request_info *info,
>  			       union iwreq_data *wrqu, char *extra)
>  {
> @@ -2488,7 +2488,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
>  	sprintf(extra, "\n\nStatus =%.2d\n", rtw_p2p_state(pwdinfo));
>  	wrqu->data.length = strlen(extra);
>  
> -	return 0;
> +	return;
>  }
>  
>  /*	Commented by Albert 20110520 */
> @@ -2496,7 +2496,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
>  /*	This config method description will show us which config method the remote P2P device is intended to use */
>  /*	by sending the provisioning discovery request frame. */
>  
> -static int rtw_p2p_get_req_cm(struct net_device *dev,
> +static void rtw_p2p_get_req_cm(struct net_device *dev,
>  			       struct iw_request_info *info,
>  			       union iwreq_data *wrqu, char *extra)
>  {
> @@ -2505,12 +2505,12 @@ static int rtw_p2p_get_req_cm(struct net_device *dev,
>  
>  	sprintf(extra, "\n\nCM =%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_role(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_role(struct net_device *dev,
> +			     struct iw_request_info *info,
> +			     union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -2521,12 +2521,12 @@ static int rtw_p2p_get_role(struct net_device *dev,
>  
>  	sprintf(extra, "\n\nRole =%.2d\n", rtw_p2p_role(pwdinfo));
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_peer_ifaddr(struct net_device *dev,
> +				    struct iw_request_info *info,
> +				    union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -2537,12 +2537,12 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
>  	sprintf(extra, "\nMAC %pM",
>  		pwdinfo->p2p_peer_interface_addr);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_peer_devaddr(struct net_device *dev,
> +				     struct iw_request_info *info,
> +				     union iwreq_data *wrqu, char *extra)
>  
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
> @@ -2554,12 +2554,13 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
>  	sprintf(extra, "\n%pM",
>  		pwdinfo->rx_prov_disc_info.peerDevAddr);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
> +						   struct iw_request_info *info,
> +						   union iwreq_data *wrqu,
> +						   char *extra)
>  
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
> @@ -2571,12 +2572,12 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
>  	sprintf(extra, "\nMAC %pM",
>  		pwdinfo->p2p_peer_device_addr);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_groupid(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_groupid(struct net_device *dev,
> +				struct iw_request_info *info,
> +				union iwreq_data *wrqu, char *extra)
>  
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
> @@ -2588,12 +2589,12 @@ static int rtw_p2p_get_groupid(struct net_device *dev,
>  		pwdinfo->groupid_info.go_device_addr[4], pwdinfo->groupid_info.go_device_addr[5],
>  		pwdinfo->groupid_info.ssid);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_get_op_ch(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_get_op_ch(struct net_device *dev,
> +			      struct iw_request_info *info,
> +			      union iwreq_data *wrqu, char *extra)
>  
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
> @@ -2603,7 +2604,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
>  
>  	sprintf(extra, "\n\nOp_ch =%.2d\n", pwdinfo->operating_channel);
>  	wrqu->data.length = strlen(extra);
> -	return 0;
> +	return;
>  }
>  
>  static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
> @@ -3049,9 +3050,9 @@ static int rtw_p2p_connect(struct net_device *dev,
>  	return ret;
>  }
>  
> -static int rtw_p2p_invite_req(struct net_device *dev,
> -			      struct iw_request_info *info,
> -			      union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_invite_req(struct net_device *dev,
> +			       struct iw_request_info *info,
> +			       union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -3076,12 +3077,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
>  
>  	if (wrqu->data.length <=  37) {
>  		DBG_88E("[%s] Wrong format!\n", __func__);
> -		return 0;
> +		return;
>  	}
>  
>  	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
>  		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
> -		return 0;
> +		return;
>  	} else {
>  		/*	Reset the content of struct tx_invite_req_info */
>  		pinvite_req_info->benable = false;
> @@ -3154,12 +3155,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
>  	} else {
>  		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
>  	}
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_set_persistent(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_set_persistent(struct net_device *dev,
> +				   struct iw_request_info *info,
> +				   union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -3172,7 +3173,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
>  
>  	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
>  		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
> -		return 0;
> +		return;
>  	} else {
>  		if (extra[0] == '0')	/*	Disable the persistent group function. */
>  			pwdinfo->persistent_supported = false;
> @@ -3182,12 +3183,12 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
>  			pwdinfo->persistent_supported = false;
>  	}
>  	pr_info("[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported);
> -	return 0;
> +	return;
>  }
>  
> -static int rtw_p2p_prov_disc(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_prov_disc(struct net_device *dev,
> +			      struct iw_request_info *info,
> +			      union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -3214,7 +3215,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
>  
>  	if (pwdinfo->p2p_state == P2P_STATE_NONE) {
>  		DBG_88E("[%s] WiFi Direct is disable!\n", __func__);
> -		return 0;
> +		return;
>  	} else {
>  		/*	Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */
>  		memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN);
> @@ -3238,7 +3239,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
>  		pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_LABEL;
>  	} else {
>  		DBG_88E("[%s] Unknown WPS config methodn", __func__);
> -		return 0;
> +		return;
>  	}
>  
>  	spin_lock_bh(&pmlmepriv->scanned_queue.lock);
> @@ -3310,15 +3311,15 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
>  	} else {
>  		DBG_88E("[%s] NOT Found in the Scanning Queue!\n", __func__);
>  	}
> -	return 0;
> +	return;
>  }
>  
>  /*	This function is used to inform the driver the user had specified the pin code value or pbc */
>  /*	to application. */
>  
> -static int rtw_p2p_got_wpsinfo(struct net_device *dev,
> -			       struct iw_request_info *info,
> -			       union iwreq_data *wrqu, char *extra)
> +static void rtw_p2p_got_wpsinfo(struct net_device *dev,
> +				struct iw_request_info *info,
> +				union iwreq_data *wrqu, char *extra)
>  {
>  	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
>  	struct wifidirect_info *pwdinfo = &padapter->wdinfo;
> @@ -3340,7 +3341,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
>  		pwdinfo->ui_got_wps_info = P2P_GOT_WPSINFO_PBC;
>  	else
>  		pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO;
> -	return 0;
> +	return;
>  }
>  
>  static int rtw_p2p_set(struct net_device *dev,
> -- 
> 2.34.1
> 
>

Are you sure that checkpatch allowed this change?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] staging: r8188eu: change functions to return void
  2022-01-06 17:58   ` Greg KH
@ 2022-01-07  6:52     ` Abdun Nihaal
  2022-01-07  8:58       ` Dan Carpenter
  0 siblings, 1 reply; 7+ messages in thread
From: Abdun Nihaal @ 2022-01-07  6:52 UTC (permalink / raw)
  To: Greg KH
  Cc: Larry.Finger, phil, straube.linux, martin, linux-staging, linux-kernel

Hello Greg,

On Thu, Jan 06, 2022 at 06:58:50PM +0100, Greg KH wrote:
> On Thu, Jan 06, 2022 at 11:11:52PM +0530, Abdun Nihaal wrote:
> > Some functions in ioctl_linux.c always returns 0 and their return values
> > are never used. Change return type of such functions to void.
> > 
> > While at it, align function arguments with open parenthesis to fix
> > checkpatch checks.
> > 
> > Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
> 
> Are you sure that checkpatch allowed this change?

Yes, I ran checkpatch on both the patches and found no errors, warnings
or checks. Is there something that needs to be fixed?

Regards,
Abdun Nihaal

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] staging: r8188eu: change functions to return void
  2022-01-07  6:52     ` Abdun Nihaal
@ 2022-01-07  8:58       ` Dan Carpenter
  2022-01-07  9:55         ` Abdun Nihaal
  0 siblings, 1 reply; 7+ messages in thread
From: Dan Carpenter @ 2022-01-07  8:58 UTC (permalink / raw)
  To: Abdun Nihaal
  Cc: Greg KH, Larry.Finger, phil, straube.linux, martin,
	linux-staging, linux-kernel

On Fri, Jan 07, 2022 at 12:22:10PM +0530, Abdun Nihaal wrote:
> Hello Greg,
> 
> On Thu, Jan 06, 2022 at 06:58:50PM +0100, Greg KH wrote:
> > On Thu, Jan 06, 2022 at 11:11:52PM +0530, Abdun Nihaal wrote:
> > > Some functions in ioctl_linux.c always returns 0 and their return values
> > > are never used. Change return type of such functions to void.
> > > 
> > > While at it, align function arguments with open parenthesis to fix
> > > checkpatch checks.
> > > 
> > > Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
> > 
> > Are you sure that checkpatch allowed this change?
> 
> Yes, I ran checkpatch on both the patches and found no errors, warnings
> or checks. Is there something that needs to be fixed?

You're not allowed to end a void function with a return statement.

Checkpatch will only detect these if you run it again with the -f
option.

regards,
dan carpenter

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] staging: r8188eu: change functions to return void
  2022-01-07  8:58       ` Dan Carpenter
@ 2022-01-07  9:55         ` Abdun Nihaal
  0 siblings, 0 replies; 7+ messages in thread
From: Abdun Nihaal @ 2022-01-07  9:55 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Greg KH, Larry.Finger, phil, straube.linux, martin,
	linux-staging, linux-kernel

Hello,

On Fri, Jan 07, 2022 at 11:58:52AM +0300, Dan Carpenter wrote:
> You're not allowed to end a void function with a return statement.

Sorry, I didn't know that. I'll fix it.

> Checkpatch will only detect these if you run it again with the -f
> option.

Thanks. I'll make sure to run checkpatch on the modified files also (not
just on the patches).

Regards,
Abdun Nihaal

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-01-07  9:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-06 17:41 [PATCH v2 0/2] staging: r8188eu: remove unneeded ret variables Abdun Nihaal
2022-01-06 17:41 ` [PATCH v2 1/2] " Abdun Nihaal
2022-01-06 17:41 ` [PATCH v2 2/2] staging: r8188eu: change functions to return void Abdun Nihaal
2022-01-06 17:58   ` Greg KH
2022-01-07  6:52     ` Abdun Nihaal
2022-01-07  8:58       ` Dan Carpenter
2022-01-07  9:55         ` Abdun Nihaal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).