diff options
| author | Tony Cho | 2015-10-20 07:26:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 02:14:35 +0100 |
| commit | 8b8ad7bc90bca63d6bc00b57af1a5f94c1897e12 (patch) | |
| tree | 395e474465ae74a218b8b9a2fdaa0dd5001191bf /drivers/staging/wilc1000 | |
| parent | staging: wilc1000: move clean up codes into wl_wlan_cleanup function (diff) | |
| download | kernel-qcow2-linux-8b8ad7bc90bca63d6bc00b57af1a5f94c1897e12.tar.gz kernel-qcow2-linux-8b8ad7bc90bca63d6bc00b57af1a5f94c1897e12.tar.xz kernel-qcow2-linux-8b8ad7bc90bca63d6bc00b57af1a5f94c1897e12.zip | |
staging: wilc1000: rename wilc_firmware in the struct wilc
This patch renames wilc_firmware in the struct wilc to the firmware. In
addition, null assignments to the wl->firmware after release_firmware
are removed because it is not necessary.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 15 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 74b7cc0ea9d2..16b1d80775e5 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -537,7 +537,7 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) goto _fail_; } #endif - g_linux_wlan->wilc_firmware = wilc_firmware; + g_linux_wlan->firmware = wilc_firmware; _fail_: @@ -594,7 +594,7 @@ static int linux_wlan_firmware_download(struct wilc *p_nic) int ret = 0; - if (g_linux_wlan->wilc_firmware == NULL) { + if (!g_linux_wlan->firmware) { PRINT_ER("Firmware buffer is NULL\n"); ret = -ENOBUFS; goto _FAIL_; @@ -603,16 +603,15 @@ static int linux_wlan_firmware_download(struct wilc *p_nic) * do the firmware download **/ PRINT_D(INIT_DBG, "Downloading Firmware ...\n"); - ret = wilc_wlan_firmware_download(g_linux_wlan->wilc_firmware->data, - g_linux_wlan->wilc_firmware->size); + ret = wilc_wlan_firmware_download(g_linux_wlan->firmware->data, + g_linux_wlan->firmware->size); if (ret < 0) goto _FAIL_; /* Freeing FW buffer */ PRINT_D(INIT_DBG, "Freeing FW buffer ...\n"); PRINT_D(INIT_DBG, "Releasing firmware\n"); - release_firmware(g_linux_wlan->wilc_firmware); - g_linux_wlan->wilc_firmware = NULL; + release_firmware(g_linux_wlan->firmware); PRINT_D(INIT_DBG, "Download Succeeded\n"); @@ -1709,8 +1708,8 @@ void wl_wlan_cleanup(void) nic[i] = netdev_priv(g_linux_wlan->vif[i].ndev); } - if (g_linux_wlan && g_linux_wlan->wilc_firmware) - release_firmware(g_linux_wlan->wilc_firmware); + if (g_linux_wlan && g_linux_wlan->firmware) + release_firmware(g_linux_wlan->firmware); if (g_linux_wlan && (g_linux_wlan->vif[0].ndev || g_linux_wlan->vif[1].ndev)) { diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index b410424beeb7..74eb7b695d13 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -182,7 +182,7 @@ struct wilc { unsigned char eth_src_address[NUM_CONCURRENT_IFC][6]; - const struct firmware *wilc_firmware; + const struct firmware *firmware; #ifdef WILC_SDIO struct sdio_func *wilc_sdio_func; |