diff mbox

[29/38] staging: wilc1000: remove goto from linux_wlan_start_firmware

Message ID 1446454281-22484-29-git-send-email-glen.lee@atmel.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Glen Lee Nov. 2, 2015, 8:51 a.m. UTC 
From: Leo Kim <leo.kim@atmel.com>

This patch remove goto feature from linux_wlan_start_firmware function.
Goto feature is return result.
So, remove goto functions and it was replaced with the return value directly.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Dan Carpenter Nov. 2, 2015, 1:36 p.m. UTC | #1 
On Mon, Nov 02, 2015 at 05:51:12PM +0900, Glen Lee wrote:
>  	PRINT_D(INIT_DBG, "Waiting for Firmware to get ready ...\n");
>  	ret = linux_wlan_lock_timeout(&wilc->sync_event, 5000);
>  	if (ret) {
>  		PRINT_D(INIT_DBG, "Firmware start timed out");
> -		goto _fail_;
> +		return ret;
>  	}
>  	PRINT_D(INIT_DBG, "Firmware successfully started\n");
>  
> -_fail_:
>  	return ret;

In a later patch, could you change this from "return ret;" to
"return 0;"

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 1e9d67f..f091a3c 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -534,18 +534,17 @@  static int linux_wlan_start_firmware(struct net_device *dev)
 	ret = wilc_wlan_start(dev);
 	if (ret < 0) {
 		PRINT_ER("Failed to start Firmware\n");
-		goto _fail_;
+		return ret;
 	}
 
 	PRINT_D(INIT_DBG, "Waiting for Firmware to get ready ...\n");
 	ret = linux_wlan_lock_timeout(&wilc->sync_event, 5000);
 	if (ret) {
 		PRINT_D(INIT_DBG, "Firmware start timed out");
-		goto _fail_;
+		return ret;
 	}
 	PRINT_D(INIT_DBG, "Firmware successfully started\n");
 
-_fail_:
 	return ret;
 }
 static int linux_wlan_firmware_download(struct net_device *dev)