Commit f8598aaa authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

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: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b8d17a0
...@@ -154,9 +154,9 @@ int wilc_spi_read(struct wilc *wilc, u8 *rb, u32 rlen) ...@@ -154,9 +154,9 @@ int wilc_spi_read(struct wilc *wilc, u8 *rb, u32 rlen)
return ret; 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; int ret;
if (rlen > 0) { if (rlen > 0) {
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
int wilc_spi_init(void); int wilc_spi_init(void);
int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len); 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_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 #endif
...@@ -250,7 +250,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz, ...@@ -250,7 +250,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
} }
rix = len; 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"); PRINT_ER("[wilc spi]: Failed cmd write, bus error...\n");
result = N_FAIL; result = N_FAIL;
return result; return result;
......
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