[PATCH] Staging: rtl8712 removed unnecessary else after return

Nitin Kuppelur nitinkuppelur at gmail.com
Thu Oct 2 11:33:24 UTC 2014


Removed unnecessary else after return to solve
checkpatch.pl warning

Signed-off-by: Nitin Kuppelur <nitinkuppelur at gmail.com>
---
 drivers/staging/rtl8712/hal_init.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 81cd654..fbaba11 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -387,12 +387,9 @@ uint rtl8712_hal_deinit(struct _adapter *padapter)
 uint rtl871x_hal_init(struct _adapter *padapter)
 {
 	padapter->hw_init_completed = false;
-	if (padapter->halpriv.hal_bus_init == NULL)
+	if (padapter->halpriv.hal_bus_init == NULL ||
+	    padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
 		return _FAIL;
-	else {
-		if (padapter->halpriv.hal_bus_init(padapter) != _SUCCESS)
-			return _FAIL;
-	}
 	if (rtl8712_hal_init(padapter) == _SUCCESS)
 		padapter->hw_init_completed = true;
 	else {
-- 
1.9.1



More information about the devel mailing list