1 files changed, 11 insertions, 6 deletions

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 0f9cbf96c093..ee1b25299dd6 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -292,6 +292,7 @@ struct asd_sas_port {
 struct asd_sas_event {
         struct sas_work work;
         struct asd_sas_phy *phy;
+        int event;
 };
 
 static inline struct asd_sas_event *to_asd_sas_event(struct work_struct *work)
@@ -301,17 +302,21 @@ static inline struct asd_sas_event *to_asd_sas_event(struct work_struct *work)
         return ev;
 }
 
+static inline void INIT_SAS_EVENT(struct asd_sas_event *ev,
+                void (*fn)(struct work_struct *),
+                struct asd_sas_phy *phy, int event)
+{
+        INIT_SAS_WORK(&ev->work, fn);
+        ev->phy = phy;
+        ev->event = event;
+}
+
+
 /* The phy pretty much is controlled by the LLDD.
  * The class only reads those fields.
  */
 struct asd_sas_phy {
 /* private: */
-        struct asd_sas_event   port_events[PORT_NUM_EVENTS];
-        struct asd_sas_event   phy_events[PHY_NUM_EVENTS];
-
-        unsigned long port_events_pending;
-        unsigned long phy_events_pending;
-
         int error;
         int suspended;