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

staging: wilc1000: linux_wlan_spi: correct types

Browse Source 
linux_spi_write(), linux_spi_read(), linux_spi_write_read():

    nwi->io_func.u.spi.spi_tx = linux_spi_write;
    nwi->io_func.u.spi.spi_rx = linux_spi_read;
    nwi->io_func.u.spi.spi_trx = linux_spi_write_read;

are expected to accept arguments of 'u8 *', u32 types:

    struct {
        int (*spi_max_speed)(void);
        int (*spi_tx)(u8 *, u32);
        int (*spi_rx)(u8 *, u32);
        int (*spi_trx)(u8 *, u8 *, u32);
    } spi;

However, linux_spi_read() and linux_spi_write_read() do not do this,
they use 'unsigned char *' and 'unsigned long' instead.

Changed the types of their arguments to satisfy the expectations.

Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stanislav Kholmanskikh 2015-10-08 21:23:13 +03:00 committed by Greg Kroah-Hartman
parent 7fa252e7ef
commit 6b69b4f0aa
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,7 +243,7 @@ int linux_spi_write(u8 *b, u32 len)
#if defined(TXRX_PHASE_SIZE) #if defined(TXRX_PHASE_SIZE)
int linux_spi_read(unsigned char *rb, unsigned long rlen) int linux_spi_read(u8 *rb, u32 rlen)
{ {
int ret; int ret;
@ -307,7 +307,7 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
kfree(t_buffer); kfree(t_buffer);
} else { } else {
PRINT_ER("can't read data with the following length: %ld\n", rlen); PRINT_ER("can't read data with the following length: %u\n", rlen);
ret = -1; ret = -1;
} }
/* change return value to match WILC interface */ /* change return value to match WILC interface */
@ -317,7 +317,7 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
} }
#else #else
int linux_spi_read(unsigned char *rb, unsigned long rlen) int linux_spi_read(u8 *rb, u32 rlen)
{ {
int ret; int ret;
@ -351,7 +351,7 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
} }
kfree(t_buffer); kfree(t_buffer);
} else { } else {
PRINT_ER("can't read data with the following length: %ld\n", rlen); PRINT_ER("can't read data with the following length: %u\n", rlen);
ret = -1; ret = -1;
} }
/* change return value to match WILC interface */ /* change return value to match WILC interface */
@ -362,7 +362,7 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
#endif #endif
int linux_spi_write_read(unsigned char *wb, unsigned char *rb, unsigned int rlen) int linux_spi_write_read(u8 *wb, u8 *rb, u32 rlen)
{ {
int ret; int ret;
@ -390,7 +390,7 @@ int linux_spi_write_read(unsigned char *wb, unsigned char *rb, unsigned int rlen
PRINT_ER("SPI transaction failed\n"); PRINT_ER("SPI transaction failed\n");
} }
} else { } else {
PRINT_ER("can't read data with the following length: %d\n", rlen); PRINT_ER("can't read data with the following length: %u\n", rlen);
ret = -1; ret = -1;
} }
/* change return value to match WILC interface */ /* change return value to match WILC interface */

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

@ -9,6 +9,6 @@ int linux_spi_init(void *vp);
void linux_spi_deinit(void *vp); void linux_spi_deinit(void *vp);
int linux_spi_write(u8 *b, u32 len); int linux_spi_write(u8 *b, u32 len);
int linux_spi_read(u8 *rb, u32 rlen); int linux_spi_read(u8 *rb, u32 rlen);
int linux_spi_write_read(unsigned char *wb, unsigned char *rb, unsigned int rlen); int linux_spi_write_read(u8 *wb, u8 *rb, u32 rlen);
int linux_spi_set_max_speed(void); int linux_spi_set_max_speed(void);
#endif #endif