staging: wilc1000: remove function pointer spi_trx

This patch removes function pointer spi_trx and call linux_spi_write_read
directly.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index f584d7e6cc08eb933b26fe2e4896963de522b8c8..789635b8c230000c741eba1648dafece53019c5e 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -14,7 +14,6 @@
 
 typedef struct {
        void *os_context;
-       int (*spi_trx)(u8 *, u8 *, u32);
        int (*spi_max_speed)(void);
        wilc_debug_func dPrint;
        int crc_off;
@@ -408,7 +407,7 @@ static int spi_cmd_complete(u8 cmd, u32 adr, u8 *b, u32 sz, u8 clockless)
        }
        rix = len;
 
-       if (!g_spi.spi_trx(wb, rb, len2)) {
+       if (!linux_spi_write_read(wb, rb, len2)) {
                PRINT_ER("[wilc spi]: Failed cmd write, bus error...\n");
                result = N_FAIL;
                return result;
@@ -976,7 +975,6 @@ static int wilc_spi_init(wilc_wlan_inp_t *inp, wilc_debug_func func)
        } else {
                return 0;
        }
-       g_spi.spi_trx = inp->io_func.u.spi.spi_trx;
        g_spi.spi_max_speed = inp->io_func.u.spi.spi_max_speed;
 
        /**