Commit 8b8ad7bc authored by Tony Cho's avatar Tony Cho Committed by Greg Kroah-Hartman

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: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4875c499
...@@ -537,7 +537,7 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) ...@@ -537,7 +537,7 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
goto _fail_; goto _fail_;
} }
#endif #endif
g_linux_wlan->wilc_firmware = wilc_firmware; g_linux_wlan->firmware = wilc_firmware;
_fail_: _fail_:
...@@ -594,7 +594,7 @@ static int linux_wlan_firmware_download(struct wilc *p_nic) ...@@ -594,7 +594,7 @@ static int linux_wlan_firmware_download(struct wilc *p_nic)
int ret = 0; int ret = 0;
if (g_linux_wlan->wilc_firmware == NULL) { if (!g_linux_wlan->firmware) {
PRINT_ER("Firmware buffer is NULL\n"); PRINT_ER("Firmware buffer is NULL\n");
ret = -ENOBUFS; ret = -ENOBUFS;
goto _FAIL_; goto _FAIL_;
...@@ -603,16 +603,15 @@ static int linux_wlan_firmware_download(struct wilc *p_nic) ...@@ -603,16 +603,15 @@ static int linux_wlan_firmware_download(struct wilc *p_nic)
* do the firmware download * do the firmware download
**/ **/
PRINT_D(INIT_DBG, "Downloading Firmware ...\n"); PRINT_D(INIT_DBG, "Downloading Firmware ...\n");
ret = wilc_wlan_firmware_download(g_linux_wlan->wilc_firmware->data, ret = wilc_wlan_firmware_download(g_linux_wlan->firmware->data,
g_linux_wlan->wilc_firmware->size); g_linux_wlan->firmware->size);
if (ret < 0) if (ret < 0)
goto _FAIL_; goto _FAIL_;
/* Freeing FW buffer */ /* Freeing FW buffer */
PRINT_D(INIT_DBG, "Freeing FW buffer ...\n"); PRINT_D(INIT_DBG, "Freeing FW buffer ...\n");
PRINT_D(INIT_DBG, "Releasing firmware\n"); PRINT_D(INIT_DBG, "Releasing firmware\n");
release_firmware(g_linux_wlan->wilc_firmware); release_firmware(g_linux_wlan->firmware);
g_linux_wlan->wilc_firmware = NULL;
PRINT_D(INIT_DBG, "Download Succeeded\n"); PRINT_D(INIT_DBG, "Download Succeeded\n");
...@@ -1709,8 +1708,8 @@ void wl_wlan_cleanup(void) ...@@ -1709,8 +1708,8 @@ void wl_wlan_cleanup(void)
nic[i] = netdev_priv(g_linux_wlan->vif[i].ndev); nic[i] = netdev_priv(g_linux_wlan->vif[i].ndev);
} }
if (g_linux_wlan && g_linux_wlan->wilc_firmware) if (g_linux_wlan && g_linux_wlan->firmware)
release_firmware(g_linux_wlan->wilc_firmware); release_firmware(g_linux_wlan->firmware);
if (g_linux_wlan && if (g_linux_wlan &&
(g_linux_wlan->vif[0].ndev || g_linux_wlan->vif[1].ndev)) { (g_linux_wlan->vif[0].ndev || g_linux_wlan->vif[1].ndev)) {
......
...@@ -182,7 +182,7 @@ struct wilc { ...@@ -182,7 +182,7 @@ struct wilc {
unsigned char eth_src_address[NUM_CONCURRENT_IFC][6]; unsigned char eth_src_address[NUM_CONCURRENT_IFC][6];
const struct firmware *wilc_firmware; const struct firmware *firmware;
#ifdef WILC_SDIO #ifdef WILC_SDIO
struct sdio_func *wilc_sdio_func; struct sdio_func *wilc_sdio_func;
......
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