sugar/linux
1
0
Fork 0
Code Activity

staging: wilc1000: wilc_spi_write_read: pass struct wilc

Browse Source 
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>
This commit is contained in:
Glen Lee
2015-11-18 15:11:31 +09:00
committed by Greg Kroah-Hartman
parent 1b8d17a0c9
commit f8598aaa21
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/wilc1000/linux_wlan_spi.c
View File

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

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

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

2
drivers/staging/wilc1000/wilc_spi.c
View File

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