Staging: wilc1000: coreconfigurator: Remove trailing whitespace

[firefly-linux-kernel-4.4.55.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 88979105e8e57db5f2b50ec15ca7feacde9412ad..be972afe6e620f0f32df1c65048cc40d59c0cedc 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -10,9 +10,6 @@
 #ifndef WILC_WLAN_IF_H
 #define WILC_WLAN_IF_H
 
-/* #define MEMORY_STATIC */
-/* #define USE_OLD_SPI_SW */
-
 #include <linux/semaphore.h>
 #include "linux_wlan_common.h"
 
@@ -121,13 +118,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
 
 #define WILC_TX_ERR_NO_BUF     (-2)
 
-typedef struct {
-       int (*wlan_cfg_get)(int, u32, int, u32);
-       int (*wlan_cfg_get_value)(u32, u8 *, u32);
-       int (*wlan_add_mgmt_to_tx_que)(void *, u8 *, u32,
-                                      wilc_tx_complete_func_t);
-} wilc_wlan_oup_t;
-
 /********************************************
  *
  *      Wlan Configuration ID
@@ -229,18 +219,18 @@ typedef enum {
        WPA2_AES_TKIP           = 0x71, /* Aes or Tkip */
 } SECURITY_T;
 
-typedef enum {
+enum AUTHTYPE {
        OPEN_SYSTEM             = 1,
        SHARED_KEY              = 2,
        ANY                     = 3,
        IEEE8021                = 5
-} AUTHTYPE_T;
+};
 
-typedef enum {
+enum SITESURVEY {
        SITE_SURVEY_1CH         = 0,
        SITE_SURVEY_ALL_CH      = 1,
        SITE_SURVEY_OFF         = 2
-} SITE_SURVEY_T;
+};
 
 typedef enum {
        NORMAL_ACK              = 0,
@@ -325,7 +315,7 @@ typedef enum {
        SW_TRIGGER_ABORT,
 } TX_ABORT_OPTION_T;
 
-typedef enum {
+enum WID_TYPE {
        WID_CHAR                = 0,
        WID_SHORT               = 1,
        WID_INT                 = 2,
@@ -336,8 +326,7 @@ typedef enum {
        WID_ADR                 = 7,
        WID_UNDEF               = 8,
        WID_TYPE_FORCE_32BIT    = 0xFFFFFFFF
-
-} WID_TYPE_T, tenuWIDtype;
+};
 
 typedef enum {
        WID_NIL                         = 0xffff,
@@ -948,11 +937,10 @@ typedef enum {
        WID_MAX                         = 0xFFFF
 } WID_T;
 
-int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup);
+int wilc_wlan_init(wilc_wlan_inp_t *inp);
 
 void wilc_bus_set_max_speed(void);
 void wilc_bus_set_default_speed(void);
 u32 wilc_get_chipid(u8 update);
-extern wilc_wlan_oup_t *gpstrWlanOps;
 
 #endif