staging: wilc1000: linux_spi_init: remove parameter vp

This patch removes function parameter vp which is not used and modify it's
related codes.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 00bc890f166251cbee263e0174a959ddf4c8cf51..fcc669c7a10f625a81e94a5b613e469bc5cf8cdc 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1566,7 +1566,7 @@ int wilc_netdev_init(struct wilc **wilc)
        }
 
        #ifndef WILC_SDIO
-       if (!linux_spi_init(&g_linux_wlan->wilc_spidev)) {
+       if (!linux_spi_init()) {
                PRINT_ER("Can't initialize SPI\n");
                return -1;
        }

diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
index 039d06192d6b1af853e97207a1a11ccb642cb828..73c788f602c02dc3c8574aa4945135778c3618f7 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -93,7 +93,7 @@ void linux_spi_deinit(void *vp)
 
 
 
-int linux_spi_init(void *vp)
+int linux_spi_init(void)
 {
        int ret = 1;
        static int called;

diff --git a/drivers/staging/wilc1000/linux_wlan_spi.h b/drivers/staging/wilc1000/linux_wlan_spi.h
index 7356785296f9fff8c5fa12c35b9c9d96088edde0..b9561003ecf0ae02776f2b458004cf807f738eb1 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.h
+++ b/drivers/staging/wilc1000/linux_wlan_spi.h
@@ -5,7 +5,7 @@
 extern struct spi_device *wilc_spi_dev;
 extern struct spi_driver wilc_bus;
 
-int linux_spi_init(void *vp);
+int linux_spi_init(void);
 void linux_spi_deinit(void *vp);
 int linux_spi_write(u8 *b, u32 len);
 int linux_spi_read(u8 *rb, u32 rlen);

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 30b1744f98f1da2a87fa19356e559eb966262ae0..fe16d705e841d66bc254838cc14c1a8b7133a3d5 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -966,7 +966,7 @@ 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 (!linux_spi_init(g_spi.os_context)) {
+       if (!linux_spi_init()) {
                PRINT_ER("[wilc spi]: Failed io init bus...\n");
                return 0;
        } else {