Commit 8eb658f1 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: rename goto labels starting with '_' in wilc1000_wlan_init()

Rename goto labels starting with '_' in wilc1000_wlan_init() to follow
linux coding style.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fe678b1
...@@ -735,42 +735,42 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif) ...@@ -735,42 +735,42 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif)
ret = wilc_wlan_init(dev); ret = wilc_wlan_init(dev);
if (ret < 0) { if (ret < 0) {
ret = -EIO; ret = -EIO;
goto _fail_locks_; goto fail_locks;
} }
if (wl->gpio >= 0 && init_irq(dev)) { if (wl->gpio >= 0 && init_irq(dev)) {
ret = -EIO; ret = -EIO;
goto _fail_locks_; goto fail_locks;
} }
ret = wlan_initialize_threads(dev); ret = wlan_initialize_threads(dev);
if (ret < 0) { if (ret < 0) {
ret = -EIO; ret = -EIO;
goto _fail_wilc_wlan_; goto fail_wilc_wlan;
} }
if (!wl->dev_irq_num && if (!wl->dev_irq_num &&
wl->hif_func->enable_interrupt && wl->hif_func->enable_interrupt &&
wl->hif_func->enable_interrupt(wl)) { wl->hif_func->enable_interrupt(wl)) {
ret = -EIO; ret = -EIO;
goto _fail_irq_init_; goto fail_irq_init;
} }
if (wilc_wlan_get_firmware(dev)) { if (wilc_wlan_get_firmware(dev)) {
ret = -EIO; ret = -EIO;
goto _fail_irq_enable_; goto fail_irq_enable;
} }
ret = wilc1000_firmware_download(dev); ret = wilc1000_firmware_download(dev);
if (ret < 0) { if (ret < 0) {
ret = -EIO; ret = -EIO;
goto _fail_irq_enable_; goto fail_irq_enable;
} }
ret = linux_wlan_start_firmware(dev); ret = linux_wlan_start_firmware(dev);
if (ret < 0) { if (ret < 0) {
ret = -EIO; ret = -EIO;
goto _fail_irq_enable_; goto fail_irq_enable;
} }
if (wilc_wlan_cfg_get(vif, 1, WID_FIRMWARE_VERSION, 1, 0)) { if (wilc_wlan_cfg_get(vif, 1, WID_FIRMWARE_VERSION, 1, 0)) {
...@@ -788,27 +788,27 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif) ...@@ -788,27 +788,27 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif)
if (ret < 0) { if (ret < 0) {
netdev_err(dev, "Failed to configure firmware\n"); netdev_err(dev, "Failed to configure firmware\n");
ret = -EIO; ret = -EIO;
goto _fail_fw_start_; goto fail_fw_start;
} }
wl->initialized = true; wl->initialized = true;
return 0; return 0;
_fail_fw_start_: fail_fw_start:
wilc_wlan_stop(wl); wilc_wlan_stop(wl);
_fail_irq_enable_: fail_irq_enable:
if (!wl->dev_irq_num && if (!wl->dev_irq_num &&
wl->hif_func->disable_interrupt) wl->hif_func->disable_interrupt)
wl->hif_func->disable_interrupt(wl); wl->hif_func->disable_interrupt(wl);
_fail_irq_init_: fail_irq_init:
if (wl->dev_irq_num) if (wl->dev_irq_num)
deinit_irq(dev); deinit_irq(dev);
wlan_deinitialize_threads(dev); wlan_deinitialize_threads(dev);
_fail_wilc_wlan_: fail_wilc_wlan:
wilc_wlan_cleanup(dev); wilc_wlan_cleanup(dev);
_fail_locks_: fail_locks:
wlan_deinit_locks(dev); wlan_deinit_locks(dev);
netdev_err(dev, "WLAN initialization FAILED\n"); netdev_err(dev, "WLAN initialization FAILED\n");
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment