Staging: w35und: remove atomic op wrappers

[cascardo/linux.git] / drivers / staging / winbond / wbhal_s.h

diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index 5b862ff..4eeb089 100644 (file)
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -445,12 +445,12 @@ typedef struct _HW_DATA_T
        //=======================================================================================
        // For USB driver, hal need more variables. Due to
        //      1. NDIS-WDM operation
-       //      2. The SME, MLME and OLD MDS need Adapter structure, but the driver under HAL doesn't
+       //      2. The SME, MLME and OLD MDS need adapter structure, but the driver under HAL doesn't
        //              have that parameter when receiving and indicating packet.
-       //              The MDS must input the Adapter pointer as the second parameter of hal_init_hardware.
+       //              The MDS must input the adapter pointer as the second parameter of hal_init_hardware.
        //              The function usage is different than PCI driver.
        //=======================================================================================
-       void* Adapter;
+       void* adapter;
 
        //===============================================
        // Definition for MAC address
@@ -461,7 +461,7 @@ typedef struct _HW_DATA_T
        //=====================================================================
        // Definition for 802.11
        //=====================================================================
-       PUCHAR  bssid_pointer; // Used by hal_get_bssid for return value
+       u8      *bssid_pointer; // Used by hal_get_bssid for return value
        u8      bssid[8];// Only 6 byte will be used. 8 byte is required for read buffer
        u8      ssid[32];// maximum ssid length is 32 byte
 
@@ -486,7 +486,7 @@ typedef struct _HW_DATA_T
        u32     CurrentRadioSw; // 20060320.2 0:On 1:Off
        u32     CurrentRadioHw; // 20060825 0:On 1:Off
 
-       PUCHAR  power_save_point;  // Used by hal_get_power_save_mode for return value
+       u8      *power_save_point;  // Used by hal_get_power_save_mode for return value
        u8      cwmin;
        u8      desired_power_save;
        u8      dtim;// Is running dtim
@@ -506,11 +506,11 @@ typedef struct _HW_DATA_T
        // Variable for each module
        //========================================================================
        WBUSB           WbUsb; // Need WbUsb.h
-       WB35REG         Wb35Reg; // Need Wb35Reg.h
+       struct wb35_reg reg; // Need Wb35Reg.h
        WB35TX          Wb35Tx; // Need Wb35Tx.h
        WB35RX          Wb35Rx; // Need Wb35Rx.h
 
-       OS_TIMER        LEDTimer;// For LED
+       struct timer_list       LEDTimer;// For LED
 
        u32             LEDpoint;// For LED
 
@@ -570,7 +570,7 @@ typedef struct _HW_DATA_T
        u32             RxByteCountLast;
        u32             TxByteCountLast;
 
-       s32             SurpriseRemoveCount;
+       atomic_t        SurpriseRemoveCount;
 
        // For global timer
        u32             time_count;//TICK_TIME_100ms 1 = 100ms