Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8d17a0 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: wilc_spi_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 functions as well.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 643b2e42

drivers/staging/wilc1000/linux_wlan_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/wilc1000/linux_wlan_spi.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/wilc1000/wilc_spi.c

+5 −5
Original line number Diff line number Diff line
@@ -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;