staging: wilc1000: wilc_spi_write_read: pass struct wilc

This patch adds new function parameter struct wilc and use it instead of
global variable wilc_dev, and pass wilc to the function as well.

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_spi.c b/drivers/staging/wilc1000/linux_wlan_spi.c
index 5066191b9013065b3f80aa2d49a6365af76c06d9..f3ffc9e6d6262b6fdbe55846d8c1b492ae455a9d 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -154,9 +154,9 @@ int wilc_spi_read(struct wilc *wilc, u8 *rb, u32 rlen)
        return ret;
 }
 
-int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen)
+int wilc_spi_write_read(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen)
 {
-       struct spi_device *spi = to_spi_device(wilc_dev->dev);
+       struct spi_device *spi = to_spi_device(wilc->dev);
        int ret;
 
        if (rlen > 0) {

diff --git a/drivers/staging/wilc1000/linux_wlan_spi.h b/drivers/staging/wilc1000/linux_wlan_spi.h
index 16f0b9fb82f8cd1395144e816e400ce1e846b3d9..00733aba917907d75f16b5be405dadff1d1f12bc 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_spi.h
+++ b/drivers/staging/wilc1000/linux_wlan_spi.h
@@ -7,5 +7,5 @@
 int wilc_spi_init(void);
 int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len);
 int wilc_spi_read(struct wilc *wilc, u8 *rb, u32 rlen);
-int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen);
+int wilc_spi_write_read(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen);
 #endif

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 5e21109ceadf6884bbf3a9e3dc8cb7f7822e6de2..d6f412117fd87bd59c02bd3f632251c19007f6c5 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -250,7 +250,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
        }
        rix = len;
 
-       if (!wilc_spi_write_read(wb, rb, len2)) {
+       if (!wilc_spi_write_read(wilc, wb, rb, len2)) {
                PRINT_ER("[wilc spi]: Failed cmd write, bus error...\n");
                result = N_FAIL;
                return result;