iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wilc1000: wilc_spi_write: pass struct wilc

Browse Source 
This patch add new function parameter struct wilc and use it instead of
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:29 +09:00 committed by Greg Kroah-Hartman
parent 9b410fe82f
commit 643b2e4262
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,9 +66,9 @@ int wilc_spi_init(void)
return 1;
}
int wilc_spi_write(u8 *b, u32 len)
int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len)
{
struct spi_device *spi = to_spi_device(wilc_dev->dev);
struct spi_device *spi = to_spi_device(wilc->dev);
int ret;
struct spi_message msg;

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

@ -2,9 +2,10 @@
#define LINUX_WLAN_SPI_H
#include <linux/spi/spi.h>
#include "wilc_wfi_netdevice.h"
int wilc_spi_init(void);
int wilc_spi_write(u8 *b, u32 len);
int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len);
int wilc_spi_read(u8 *rb, u32 rlen);
int wilc_spi_write_read(u8 *wb, u8 *rb, u32 rlen);
#endif

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

@ -482,7 +482,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
order = 0x2;
}
cmd |= order;
if (!wilc_spi_write(&cmd, 1)) {
if (!wilc_spi_write(wilc, &cmd, 1)) {
PRINT_ER("[wilc spi]: Failed data block cmd write, bus error...\n");
result = N_FAIL;
break;
@ -491,7 +491,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
/**
* Write data
**/
if (!wilc_spi_write(&b[ix], nbytes)) {
if (!wilc_spi_write(wilc, &b[ix], nbytes)) {
PRINT_ER("[wilc spi]: Failed data block write, bus error...\n");
result = N_FAIL;
break;
@ -501,7 +501,7 @@ static int spi_data_write(struct wilc *wilc, u8 *b, u32 sz)
* Write Crc
**/
if (!g_spi.crc_off) {
if (!wilc_spi_write(crc, 2)) {
if (!wilc_spi_write(wilc, crc, 2)) {
PRINT_ER("[wilc spi]: Failed data block crc write, bus error...\n");
result = N_FAIL;
break;