]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: remove function pointer sdio_set_default_speed
authorGlen Lee <glen.lee@atmel.com>
Fri, 6 Nov 2015 09:40:05 +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_default_speed of wilc_sdio_t
and call linux_sdio_set_default_speed() 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 0ce2eccb361824263b4d7502a9acc4b64b37d772..6f488395e1b3f7151cd2fb7c157d0f712e00bf9d 100644 (file)
@@ -17,7 +17,6 @@
 typedef struct {
        void *os_context;
        u32 block_size;
-       int (*sdio_set_default_speed)(void);
        wilc_debug_func dPrint;
        int nint;
 #define MAX_NUN_INT_THRPT_ENH2 (5) /* Max num interrupts allowed in registers 0xf7, 0xf8 */
@@ -572,8 +571,6 @@ static int sdio_init(wilc_wlan_inp_t *inp, wilc_debug_func func)
                return 0;
        }
 
-       g_sdio.sdio_set_default_speed   = inp->io_func.u.sdio.sdio_set_default_speed;
-
        /**
         *      function 0 csa enable
         **/
@@ -681,7 +678,7 @@ static void sdio_set_max_speed(void)
 
 static void sdio_set_default_speed(void)
 {
-       g_sdio.sdio_set_default_speed();
+       linux_sdio_set_default_speed();
 }
 
 static int sdio_read_size(u32 *size)