mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 10:49:33 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: remove function pointer io_init

Browse source 
This patch removes function pointer io_init of wilc_wlan_io_func_t and it's
related codes, and call the function linux_spi_init directly.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-11-06 18:40:17 +09:00 committed by Greg Kroah-Hartman
parent d8dd29dd3f
commit 62342c7af7
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View file

@ -892,11 +892,9 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, struct wilc *nic)
#ifdef WILC_SDIO
nwi->io_func.io_type = HIF_SDIO;
nwi->io_func.io_init = linux_sdio_init;
nwi->io_func.io_deinit = linux_sdio_deinit;
#else
nwi->io_func.io_type = HIF_SPI;
nwi->io_func.io_init = linux_spi_init;
nwi->io_func.io_deinit = linux_spi_deinit;
#endif
}

8
drivers/staging/wilc1000/wilc_spi.c
View file

@ -966,11 +966,9 @@ static int wilc_spi_init(wilc_wlan_inp_t *inp, wilc_debug_func func)
g_spi.dPrint = func;
g_spi.os_context = inp->os_context.os_private;
if (inp->io_func.io_init) {
if (!inp->io_func.io_init(g_spi.os_context)) {
PRINT_ER("[wilc spi]: Failed io init bus...\n");
return 0;
}
if (!linux_spi_init(g_spi.os_context)) {
PRINT_ER("[wilc spi]: Failed io init bus...\n");
return 0;
} else {
return 0;
}

1
drivers/staging/wilc1000/wilc_wlan_if.h
View file

@ -74,7 +74,6 @@ typedef struct {
typedef struct {
int io_type;
int (*io_init)(void *);
void (*io_deinit)(void *);
} wilc_wlan_io_func_t;