|
@@ -735,42 +735,42 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif)
|
|
|
ret = wilc_wlan_init(dev);
|
|
|
if (ret < 0) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_locks_;
|
|
|
+ goto fail_locks;
|
|
|
}
|
|
|
|
|
|
if (wl->gpio >= 0 && init_irq(dev)) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_locks_;
|
|
|
+ goto fail_locks;
|
|
|
}
|
|
|
|
|
|
ret = wlan_initialize_threads(dev);
|
|
|
if (ret < 0) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_wilc_wlan_;
|
|
|
+ goto fail_wilc_wlan;
|
|
|
}
|
|
|
|
|
|
if (!wl->dev_irq_num &&
|
|
|
wl->hif_func->enable_interrupt &&
|
|
|
wl->hif_func->enable_interrupt(wl)) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_irq_init_;
|
|
|
+ goto fail_irq_init;
|
|
|
}
|
|
|
|
|
|
if (wilc_wlan_get_firmware(dev)) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_irq_enable_;
|
|
|
+ goto fail_irq_enable;
|
|
|
}
|
|
|
|
|
|
ret = wilc1000_firmware_download(dev);
|
|
|
if (ret < 0) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_irq_enable_;
|
|
|
+ goto fail_irq_enable;
|
|
|
}
|
|
|
|
|
|
ret = linux_wlan_start_firmware(dev);
|
|
|
if (ret < 0) {
|
|
|
ret = -EIO;
|
|
|
- goto _fail_irq_enable_;
|
|
|
+ goto fail_irq_enable;
|
|
|
}
|
|
|
|
|
|
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)
|
|
|
if (ret < 0) {
|
|
|
netdev_err(dev, "Failed to configure firmware\n");
|
|
|
ret = -EIO;
|
|
|
- goto _fail_fw_start_;
|
|
|
+ goto fail_fw_start;
|
|
|
}
|
|
|
|
|
|
wl->initialized = true;
|
|
|
return 0;
|
|
|
|
|
|
-_fail_fw_start_:
|
|
|
+fail_fw_start:
|
|
|
wilc_wlan_stop(wl);
|
|
|
|
|
|
-_fail_irq_enable_:
|
|
|
+fail_irq_enable:
|
|
|
if (!wl->dev_irq_num &&
|
|
|
wl->hif_func->disable_interrupt)
|
|
|
wl->hif_func->disable_interrupt(wl);
|
|
|
-_fail_irq_init_:
|
|
|
+fail_irq_init:
|
|
|
if (wl->dev_irq_num)
|
|
|
deinit_irq(dev);
|
|
|
|
|
|
wlan_deinitialize_threads(dev);
|
|
|
-_fail_wilc_wlan_:
|
|
|
+fail_wilc_wlan:
|
|
|
wilc_wlan_cleanup(dev);
|
|
|
-_fail_locks_:
|
|
|
+fail_locks:
|
|
|
wlan_deinit_locks(dev);
|
|
|
netdev_err(dev, "WLAN initialization FAILED\n");
|
|
|
} else {
|