A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

staging: wilc1000: wilc_spi_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 functions 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:30 +09:00 • committed by Greg Kroah-Hartman
commit 1b8d17a0c9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,9 +112,9 @@ int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len)
return ret;
}
int wilc_spi_read(u8 *rb, u32 rlen)
int wilc_spi_read(struct wilc *wilc, 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

@ -6,6 +6,6 @@
int wilc_spi_init(void);
int wilc_spi_write(struct wilc *wilc, u8 *b, u32 len);
int wilc_spi_read(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);
#endif

10
drivers/staging/wilc1000/wilc_spi.c
View file

@ -365,7 +365,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
/**
* Read bytes
**/
if (!wilc_spi_read(&b[ix], nbytes)) {
if (!wilc_spi_read(wilc, &b[ix], nbytes)) {
PRINT_ER("[wilc spi]: Failed data block read, bus error...\n");
result = N_FAIL;
goto _error_;
@ -375,7 +375,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
* Read Crc
**/
if (!g_spi.crc_off) {
if (!wilc_spi_read(crc, 2)) {
if (!wilc_spi_read(wilc, crc, 2)) {
PRINT_ER("[wilc spi]: Failed data block crc read, bus error...\n");
result = N_FAIL;
goto _error_;
@ -406,7 +406,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
**/
retry = 10;
do {
if (!wilc_spi_read(&rsp, 1)) {
if (!wilc_spi_read(wilc, &rsp, 1)) {
PRINT_ER("[wilc spi]: Failed data response read, bus error...\n");
result = N_FAIL;
break;
@ -422,7 +422,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
/**
* Read bytes
**/
if (!wilc_spi_read(&b[ix], nbytes)) {
if (!wilc_spi_read(wilc, &b[ix], nbytes)) {
PRINT_ER("[wilc spi]: Failed data block read, bus error...\n");
result = N_FAIL;
break;
@ -432,7 +432,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
* Read Crc
**/
if (!g_spi.crc_off) {
if (!wilc_spi_read(crc, 2)) {
if (!wilc_spi_read(wilc, crc, 2)) {
PRINT_ER("[wilc spi]: Failed data block crc read, bus error...\n");
result = N_FAIL;
break;