Skip to contentSkip to conversation

Staging: rtl8712: Removed unused return variable

PATCH In review DHANAPAL, GNANACHANDRAN (G.) 4 participants 4 messages Apr 23, 2015 – Apr 24, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Staging: rtl8712: Removed unused return variable

This patch removes unused return variable in this file.

---
 drivers/staging/rtl8712/os_intfs.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/os_intfs.c +2 -4
index 6e776e5..b881368 100644
@@ -128,7 +128,6 @@ static int netdev_close(struct net_device *pnetdev);
 
 static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
 {
-	uint status = _SUCCESS;
 	struct registry_priv  *registry_par = &padapter->registrypriv;
 
 	registry_par->chip_version = (u8)chip_version;
@@ -172,7 +171,7 @@ static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
 	registry_par->low_power = (u8)low_power;
 	registry_par->wifi_test = (u8) wifi_test;
 	r8712_initmac = initmac;
-	return status;
+	return _SUCCESS;
 }
 
 static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p)
@@ -273,7 +272,6 @@ void r8712_stop_drv_timers(struct _adapter *padapter)
 
 static u8 init_default_value(struct _adapter *padapter)
 {
-	u8 ret  = _SUCCESS;
 	struct registry_priv *pregistrypriv = &padapter->registrypriv;
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -306,7 +304,7 @@ static u8 init_default_value(struct _adapter *padapter)
 	r8712_init_registrypriv_dev_network(padapter);
 	r8712_update_registrypriv_dev_network(padapter);
 	/*misc.*/
-	return ret;
+	return _SUCCESS;
 }
 
 u8 r8712_init_drv_sw(struct _adapter *padapter)
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 1 line · GNANACHANDRAN (G.)

This patch removes unused return variable in this file.

You should hold off with V2 to give others a chance to comment.

Your commit message does not exactly describe what is happening. The return variable is not unused. More accurately, you have rewritten the routine to always return a constant.

I have not looked at the generated code, but I suspect that gcc is already doing that when it optimizes the code. If you really want to reduce the size of the generated code, there is no reason for this function to be of type uint. It should be type void and not return anything.

Larry

Quoted 45 lines
---
  drivers/staging/rtl8712/os_intfs.c |    6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/os_intfs.c +2 -4
index 6e776e5..b881368 100644
@@ -128,7 +128,6 @@ static int netdev_close(struct net_device *pnetdev);
 
  static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
  {
-	uint status = _SUCCESS;
  	struct registry_priv  *registry_par = &padapter->registrypriv;
 
  	registry_par->chip_version = (u8)chip_version;
@@ -172,7 +171,7 @@ static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
  	registry_par->low_power = (u8)low_power;
  	registry_par->wifi_test = (u8) wifi_test;
  	r8712_initmac = initmac;
-	return status;
+	return _SUCCESS;
  }
 
  static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p)
@@ -273,7 +272,6 @@ void r8712_stop_drv_timers(struct _adapter *padapter)
 
  static u8 init_default_value(struct _adapter *padapter)
  {
-	u8 ret  = _SUCCESS;
  	struct registry_priv *pregistrypriv = &padapter->registrypriv;
  	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
  	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -306,7 +304,7 @@ static u8 init_default_value(struct _adapter *padapter)
  	r8712_init_registrypriv_dev_network(padapter);
  	r8712_update_registrypriv_dev_network(padapter);
  	/*misc.*/
-	return ret;
+	return _SUCCESS;
  }
 
  u8 r8712_init_drv_sw(struct _adapter *padapter)
#2 lore raw

This patch is a coccinelle thing, the reasoning behind it is that literals are more clear than variables.

return status; <-- Ambiguous. This could be returning anything,
you have to look at the context.

return 0; <-- Clear.

regards,
dan carpenter