ACPI: processor: use .notify method instead of installing handler directly

[sfrench/cifs-2.6.git] / drivers / staging / winbond / bssdscpt.h

diff --git a/drivers/staging/winbond/bssdscpt.h b/drivers/staging/winbond/bssdscpt.h
index 97150a2655fb18af461e5d770d330e9a7c48440d..3a71d4efb897477f9d15c1f8dde04060d2eedebb 100644 (file)
--- a/drivers/staging/winbond/bssdscpt.h
+++ b/drivers/staging/winbond/bssdscpt.h
@@ -1,3 +1,11 @@
+#ifndef __WINBOND_BSSDSCPT_H
+#define __WINBOND_BSSDSCPT_H
+
+#include <linux/types.h>
+
+#include "mds_s.h"
+#include "mlme_s.h"
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //     bssdscpt.c
 //             BSS descriptor data base
@@ -78,8 +86,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 +156,9 @@ typedef struct BSSDescriptionElement
 
 } WB_BSSDESCRIPTION, *PWB_BSSDESCRIPTION;
 
-#define wBSSConnectedSTA(Adapter)             \
-    ((u16)(Adapter)->sLocalPara.wConnectedSTAindex)
-
-#define psBSS(i)                       (&(Adapter->asBSSDescriptElement[(i)]))
+#define wBSSConnectedSTA(adapter)             \
+    ((u16)(adapter)->sLocalPara.wConnectedSTAindex)
 
+#define psBSS(i)                       (&(adapter->asBSSDescriptElement[(i)]))
 
+#endif