aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Kim <[email protected]>2015-11-05 14:36:31 +0900
committerGreg Kroah-Hartman <[email protected]>2015-11-15 20:02:47 -0800
commit14b1821dd2ee72ac5ce360c8a420f4e87b0e923a (patch)
treef4c7438966dc572d2647855d09218c28c1efe273
parent0aeea1ad2ab342153019b676a2d3cbbb45669c79 (diff)
staging: wilc1000: remove goto from linux_wlan_firmware_download
This patch remove goto feature from linux_wlan_firmware_download function. Goto feature is return result. So, remove goto functions and it was replaced with the return value directly. Signed-off-by: Leo Kim <[email protected]> Signed-off-by: Glen Lee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/wilc1000/linux_wlan.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index fcc811909343..003165d57cfb 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -553,14 +553,13 @@ static int linux_wlan_firmware_download(struct net_device *dev)
if (!wilc->firmware) {
PRINT_ER("Firmware buffer is NULL\n");
- ret = -ENOBUFS;
- goto _FAIL_;
+ return -ENOBUFS;
}
PRINT_D(INIT_DBG, "Downloading Firmware ...\n");
ret = wilc_wlan_firmware_download(wilc->firmware->data,
wilc->firmware->size);
if (ret < 0)
- goto _FAIL_;
+ return ret;
PRINT_D(INIT_DBG, "Freeing FW buffer ...\n");
PRINT_D(INIT_DBG, "Releasing firmware\n");
@@ -568,8 +567,7 @@ static int linux_wlan_firmware_download(struct net_device *dev)
PRINT_D(INIT_DBG, "Download Succeeded\n");
-_FAIL_:
- return ret;
+ return 0;
}
static int linux_wlan_init_test_config(struct net_device *dev, struct wilc *p_nic)