]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: remove goto from linux_wlan_start_firmware
authorLeo Kim <leo.kim@atmel.com>
Thu, 5 Nov 2015 05:36:30 +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_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>
drivers/staging/wilc1000/linux_wlan.c

index 893c741794b8d309fb8540ccc6eb6103c5bebfef..fcc811909343876769ae29743fa5d92d71b6a059 100644 (file)
@@ -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)
 {