staging: wilc1000: remove goto from linux_wlan_firmware_download
authorLeo Kim <leo.kim@atmel.com>
Thu, 5 Nov 2015 05:36:31 +0000 (14:36 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000 (20:02 -0800)
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 <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index fcc811909343876769ae29743fa5d92d71b6a059..003165d57cfbcadcd9836de17d73805642ddf24b 100644 (file)
@@ -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)