staging: wilc1000: remove spi_max_speed of wilc_wlan_io_func_t

[deliverable/linux.git] / drivers / staging / wilc1000 / wilc_wlan_if.h

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index be972afe6e620f0f32df1c65048cc40d59c0cedc..0f15795c95ec9fd6de02100174f4825de625370a 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -12,6 +12,7 @@
 
 #include <linux/semaphore.h>
 #include "linux_wlan_common.h"
+#include <linux/netdevice.h>
 
 /********************************************
  *
@@ -75,20 +76,6 @@ typedef struct {
        int io_type;
        int (*io_init)(void *);
        void (*io_deinit)(void *);
-       union {
-               struct {
-                       int (*sdio_cmd52)(sdio_cmd52_t *);
-                       int (*sdio_cmd53)(sdio_cmd53_t *);
-                       int (*sdio_set_max_speed)(void);
-                       int (*sdio_set_default_speed)(void);
-               } sdio;
-               struct {
-                       int (*spi_max_speed)(void);
-                       int (*spi_tx)(u8 *, u32);
-                       int (*spi_rx)(u8 *, u32);
-                       int (*spi_trx)(u8 *, u8 *, u32);
-               } spi;
-       } u;
 } wilc_wlan_io_func_t;
 
 #define WILC_MAC_INDICATE_STATUS       0x1
@@ -315,7 +302,7 @@ typedef enum {
        SW_TRIGGER_ABORT,
 } TX_ABORT_OPTION_T;
 
-enum WID_TYPE {
+enum wid_type {
        WID_CHAR                = 0,
        WID_SHORT               = 1,
        WID_INT                 = 2,
@@ -937,7 +924,7 @@ typedef enum {
        WID_MAX                         = 0xFFFF
 } WID_T;
 
-int wilc_wlan_init(wilc_wlan_inp_t *inp);
+int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp);
 
 void wilc_bus_set_max_speed(void);
 void wilc_bus_set_default_speed(void);