hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tony Cho 2015-10-20 14:26:53 +09:00 committed by Greg Kroah-Hartman
parent 4875c499dc
commit 8b8ad7bc90
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/wilc1000/linux_wlan.c
View File

@ -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)) {

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -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;