Return-path: Received: from esa2.microchip.iphmx.com ([68.232.149.84]:14322 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932172AbeDWQgF (ORCPT ); Mon, 23 Apr 2018 12:36:05 -0400 From: Ajay Singh To: CC: , , , , , , , Ajay Singh Subject: [RESEND 31/33] staging: wilc1000: rename goto labels starting with '_' in wilc1000_wlan_init() Date: Mon, 23 Apr 2018 22:03:33 +0530 Message-ID: <1524501215-4963-32-git-send-email-ajay.kathat@microchip.com> (sfid-20180423_183616_933561_8AB349C1) In-Reply-To: <1524501215-4963-1-git-send-email-ajay.kathat@microchip.com> References: <1524501215-4963-1-git-send-email-ajay.kathat@microchip.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: Rename goto labels starting with '_' in wilc1000_wlan_init() to follow linux coding style. Signed-off-by: Ajay Singh Reviewed-by: Claudiu Beznea --- drivers/staging/wilc1000/linux_wlan.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 8f97c62..26edbb6 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -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 { -- 2.7.4