aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2015-11-05 14:36:30 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-15 20:02:47 -0800
commit0aeea1ad2ab342153019b676a2d3cbbb45669c79 (patch)
tree8d1dcfba66669bfc2c959e395c14d3c5faf65e21
parentstaging: wilc1000: fixes braces {} should be used on all arms of this statement (diff)
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>
-rw-r--r--drivers/staging/wilc1000/linux_wlan.c7
1 files changed, 3 insertions, 4 deletions
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)
{