OSDN Git Service

staging: wilc1000: remove function pointer sdio_set_max_speed
authorGlen Lee <glen.lee@atmel.com>
Fri, 6 Nov 2015 09:40:03 +0000 (18:40 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000 (20:02 -0800)
This patch removes function pointer sdio_set_max_speed of wilc_sdio_t and
call the function directly.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_sdio.c

index 1176946..0ce2ecc 100644 (file)
@@ -17,7 +17,6 @@
 typedef struct {
        void *os_context;
        u32 block_size;
-       int (*sdio_set_max_speed)(void);
        int (*sdio_set_default_speed)(void);
        wilc_debug_func dPrint;
        int nint;
@@ -573,7 +572,6 @@ static int sdio_init(wilc_wlan_inp_t *inp, wilc_debug_func func)
                return 0;
        }
 
-       g_sdio.sdio_set_max_speed       = inp->io_func.u.sdio.sdio_set_max_speed;
        g_sdio.sdio_set_default_speed   = inp->io_func.u.sdio.sdio_set_default_speed;
 
        /**
@@ -678,7 +676,7 @@ _fail_:
 
 static void sdio_set_max_speed(void)
 {
-       g_sdio.sdio_set_max_speed();
+       linux_sdio_set_max_speed();
 }
 
 static void sdio_set_default_speed(void)