Staging: w35und: remove atomic op wrappers

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

diff --git a/drivers/staging/winbond/bssdscpt.h b/drivers/staging/winbond/bssdscpt.h
index 97150a2..90b5682 100644 (file)
--- a/drivers/staging/winbond/bssdscpt.h
+++ b/drivers/staging/winbond/bssdscpt.h
@@ -78,8 +78,8 @@ typedef struct BSSDescriptionElement
     u16                wState;                 // the current state of the system
        u16             wIndex;                 // THIS BSS element entry index
 
-       void*   psAdapter;              // pointer to THIS Adapter
-       OS_TIMER        nTimer;  // MLME timer
+       void*   psadapter;              // pointer to THIS adapter
+       struct timer_list timer;  // MLME timer
 
     // Authentication
     u16                wAuthAlgo;      // peer MAC MLME use Auth algorithm, default OPEN_AUTH
@@ -148,9 +148,9 @@ typedef struct BSSDescriptionElement
 
 } WB_BSSDESCRIPTION, *PWB_BSSDESCRIPTION;
 
-#define wBSSConnectedSTA(Adapter)             \
-    ((u16)(Adapter)->sLocalPara.wConnectedSTAindex)
+#define wBSSConnectedSTA(adapter)             \
+    ((u16)(adapter)->sLocalPara.wConnectedSTAindex)
 
-#define psBSS(i)                       (&(Adapter->asBSSDescriptElement[(i)]))
+#define psBSS(i)                       (&(adapter->asBSSDescriptElement[(i)]))