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

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

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

drivers/staging/wilc1000/linux_wlan_spi.c

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

drivers/staging/wilc1000/linux_wlan_spi.h

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

drivers/staging/wilc1000/wilc_spi.c

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