staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / linux_wlan_common.h

diff --git a/drivers/staging/wilc1000/linux_wlan_common.h b/drivers/staging/wilc1000/linux_wlan_common.h
index e6ebf3e89129eaf82d4059c856e0ac7571d192da..2b76e41ebd4d506ec0fc85002b51acaa6a98b5ed 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan_common.h
+++ b/drivers/staging/wilc1000/linux_wlan_common.h
@@ -12,7 +12,6 @@ enum debug_region {
        RX_debug,
        Lock_debug,
        Tcp_enhance,
-       /*Added by amr - BugID_4720*/
        Spin_debug,
 
        Init_debug,
@@ -45,10 +44,10 @@ void wilc_debugfs_remove(void);
 extern atomic_t REGION;
 extern atomic_t DEBUG_LEVEL;
 
-#define DEBUG           (1 << 0)
-#define INFO            (1 << 1)
-#define WRN             (1 << 2)
-#define ERR             (1 << 3)
+#define DEBUG           BIT(0)
+#define INFO            BIT(1)
+#define WRN             BIT(2)
+#define ERR             BIT(3)
 
 #define PRINT_D(region, ...)                                           \
        do {                                                            \
@@ -135,12 +134,7 @@ extern atomic_t DEBUG_LEVEL;
 
 #define WILC_MULTICAST_TABLE_SIZE      8
 
-#if defined (NM73131_0_BOARD)
-
-#define MODALIAS "wilc_spi"
-#define GPIO_NUM       IRQ_WILC1000_GPIO
-
-#elif defined (BEAGLE_BOARD)
+#if defined (BEAGLE_BOARD)
        #define SPI_CHANNEL     4
 
        #if SPI_CHANNEL == 4
@@ -150,9 +144,6 @@ extern atomic_t DEBUG_LEVEL;
                #define MODALIAS        "wilc_spi3"
                #define GPIO_NUM        133
        #endif
-#elif defined(PANDA_BOARD)
-       #define MODALIAS        "WILC_SPI"
-       #define GPIO_NUM        139
 #elif defined(PLAT_WMS8304)             /* rachel */
        #define MODALIAS        "wilc_spi"
        #define GPIO_NUM        139
@@ -176,7 +167,4 @@ extern atomic_t DEBUG_LEVEL;
        #define MODALIAS        "WILC_SPI"
        #define GPIO_NUM        0x44
 #endif
-
-
-void linux_wlan_enable_irq(void);
 #endif