Skip to contentSkip to conversation

staging: r8188eu: keep the success path and error path separate

PATCH In review Vihas Makwana 3 participants 3 messages Feb 9, 2022 – Feb 10, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: r8188eu: keep the success path and error path separate

Keep the success path and error path separate in rtw_usb_if1_init() and drop the "status" variable.
Also, remove do-nothing gotos.

---
v1->v2:
Just return NULL instead of padapter=NULL/return padapter

 drivers/staging/r8188eu/os_dep/usb_intf.c | 30 +++++++++--------------
 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +12 -18
index 10c33e2ae..668e79a3c 100644
@@ -336,13 +336,13 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
 {
 	struct adapter *padapter = NULL;
 	struct net_device *pnetdev = NULL;
-	int status = _FAIL;
 	struct io_priv *piopriv;
 	struct intf_hdl *pintf;
 
 	padapter = vzalloc(sizeof(*padapter));
 	if (!padapter)
-		goto exit;
+		return NULL;
+
 	padapter->dvobj = dvobj;
 	dvobj->if1 = padapter;
 
@@ -421,26 +421,20 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
 		, padapter->hw_init_completed
 	);
 
-	status = _SUCCESS;
+	return padapter;
 
 free_drv_sw:
-	if (status != _SUCCESS) {
-		rtw_cancel_all_timer(padapter);
-		rtw_free_drv_sw(padapter);
-	}
+	rtw_cancel_all_timer(padapter);
+	rtw_free_drv_sw(padapter);
 handle_dualmac:
-	if (status != _SUCCESS)
-		rtw_handle_dualmac(padapter, 0);
+	rtw_handle_dualmac(padapter, 0);
 free_adapter:
-	if (status != _SUCCESS) {
-		if (pnetdev)
-			rtw_free_netdev(pnetdev);
-		else if (padapter)
-			vfree(padapter);
-		padapter = NULL;
-	}
-exit:
-	return padapter;
+	if (pnetdev)
+		rtw_free_netdev(pnetdev);
+	else if (padapter)
+		vfree(padapter);
+
+	return NULL;
 }
 
 static void rtw_usb_if1_deinit(struct adapter *if1)
Signature · 1 line
2.30.2
Reviewed-by on v2 1/1
#1 lore raw

Hi Vihas,

Quoted 6 lines · Vihas Makwana

Keep the success path and error path separate in rtw_usb_if1_init() and drop the "status" variable.
Also, remove do-nothing gotos.

---

Looks good, thanks

Quoted 52 lines

v1->v2:
Just return NULL instead of padapter=NULL/return padapter

  drivers/staging/r8188eu/os_dep/usb_intf.c | 30 +++++++++--------------
  1 file changed, 12 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +6 -17
index 10c33e2ae..668e79a3c 100644
@@ -336,13 +336,13 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
  {
  	struct adapter *padapter = NULL;
  	struct net_device *pnetdev = NULL;
-	int status = _FAIL;
  	struct io_priv *piopriv;
  	struct intf_hdl *pintf;
 
  	padapter = vzalloc(sizeof(*padapter));
  	if (!padapter)
-		goto exit;
+		return NULL;
+
  	padapter->dvobj = dvobj;
  	dvobj->if1 = padapter;
 
@@ -421,26 +421,20 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
  		, padapter->hw_init_completed
  	);
 
-	status = _SUCCESS;
+	return padapter;
 
  free_drv_sw:
-	if (status != _SUCCESS) {
-		rtw_cancel_all_timer(padapter);
-		rtw_free_drv_sw(padapter);
-	}
+	rtw_cancel_all_timer(padapter);
+	rtw_free_drv_sw(padapter);
  handle_dualmac:
-	if (status != _SUCCESS)
-		rtw_handle_dualmac(padapter, 0);
+	rtw_handle_dualmac(padapter, 0);
  free_adapter:
-	if (status != _SUCCESS) {
-		if (pnetdev)
-			rtw_free_netdev(pnetdev);
-		else if (padapter)
-			vfree(padapter);
-		padapter = NULL;
-	}
-exit:

drivers/staging/r8188eu/os_dep/usb_intf.c static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, · line 440

Quoted 10 lines
drivers/staging/r8188eu/os_dep/usb_intf.c +6 -1
-	return padapter;
+	if (pnetdev)
+		rtw_free_netdev(pnetdev);
+	else if (padapter)
+		vfree(padapter);
+
+	return NULL;
  }
 
  static void rtw_usb_if1_deinit(struct adapter *if1)

With regards,
Pavel Skripkin