From: Leo Kim <leo.kim@atmel.com>
Date: Thu, 5 Nov 2015 05:36:30 +0000 (+0900)
Subject: staging: wilc1000: remove goto from linux_wlan_start_firmware
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0aeea1ad2ab342153019b676a2d3cbbb45669c79;p=deliverable%2Flinux.git

staging: wilc1000: remove goto from linux_wlan_start_firmware

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 893c741794b8..fcc811909343 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -529,19 +529,18 @@ static int linux_wlan_start_firmware(struct net_device *dev)
 	ret = wilc_wlan_start();
 	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;
+	return 0;
 }
 static int linux_wlan_firmware_download(struct net_device *dev)
 {