6 files changed, 81 insertions, 48 deletions

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index d977bd492d8d..fb7df7b75811 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -647,10 +647,12 @@ void sas_unregister_domain_devices(struct asd_sas_port *port)
  * Discover process only interrogates devices in order to discover the
  * domain.
  */
-static void sas_discover_domain(void *data)
+static void sas_discover_domain(struct work_struct *work)
 {
         int error = 0;
-        struct asd_sas_port *port = data;
+        struct sas_discovery_event *ev =
+                container_of(work, struct sas_discovery_event, work);
+        struct asd_sas_port *port = ev->port;
 
         sas_begin_event(DISCE_DISCOVER_DOMAIN, &port->disc.disc_event_lock,
                         &port->disc.pending);
@@ -692,10 +694,12 @@ static void sas_discover_domain(void *data)
                     current->pid, error);
 }
 
-static void sas_revalidate_domain(void *data)
+static void sas_revalidate_domain(struct work_struct *work)
 {
         int res = 0;
-        struct asd_sas_port *port = data;
+        struct sas_discovery_event *ev =
+                container_of(work, struct sas_discovery_event, work);
+        struct asd_sas_port *port = ev->port;
 
         sas_begin_event(DISCE_REVALIDATE_DOMAIN, &port->disc.disc_event_lock,
                         &port->disc.pending);
@@ -722,7 +726,7 @@ int sas_discover_event(struct asd_sas_port *port, enum discover_event ev)
         BUG_ON(ev >= DISC_NUM_EVENTS);
 
         sas_queue_event(ev, &disc->disc_event_lock, &disc->pending,
-                        &disc->disc_work[ev], port->ha->core.shost);
+                        &disc->disc_work[ev].work, port->ha->core.shost);
 
         return 0;
 }
@@ -737,13 +741,15 @@ void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port)
 {
         int i;
 
-        static void (*sas_event_fns[DISC_NUM_EVENTS])(void *) = {
+        static const work_func_t sas_event_fns[DISC_NUM_EVENTS] = {
                 [DISCE_DISCOVER_DOMAIN] = sas_discover_domain,
                 [DISCE_REVALIDATE_DOMAIN] = sas_revalidate_domain,
         };
 
         spin_lock_init(&disc->disc_event_lock);
         disc->pending = 0;
-        for (i = 0; i < DISC_NUM_EVENTS; i++)
-                INIT_WORK(&disc->disc_work[i], sas_event_fns[i], port);
+        for (i = 0; i < DISC_NUM_EVENTS; i++) {
+                INIT_WORK(&disc->disc_work[i].work, sas_event_fns[i]);
+                disc->disc_work[i].port = port;
+        }
 }
diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c
index 19110ed1c89c..d83392ee6823 100644
--- a/drivers/scsi/libsas/sas_event.c
+++ b/drivers/scsi/libsas/sas_event.c
@@ -31,7 +31,7 @@ static void notify_ha_event(struct sas_ha_struct *sas_ha, enum ha_event event)
         BUG_ON(event >= HA_NUM_EVENTS);
 
         sas_queue_event(event, &sas_ha->event_lock, &sas_ha->pending,
-                        &sas_ha->ha_events[event], sas_ha->core.shost);
+                        &sas_ha->ha_events[event].work, sas_ha->core.shost);
 }
 
 static void notify_port_event(struct asd_sas_phy *phy, enum port_event event)
@@ -41,7 +41,7 @@ static void notify_port_event(struct asd_sas_phy *phy, enum port_event event)
         BUG_ON(event >= PORT_NUM_EVENTS);
 
         sas_queue_event(event, &ha->event_lock, &phy->port_events_pending,
-                        &phy->port_events[event], ha->core.shost);
+                        &phy->port_events[event].work, ha->core.shost);
 }
 
 static void notify_phy_event(struct asd_sas_phy *phy, enum phy_event event)
@@ -51,12 +51,12 @@ static void notify_phy_event(struct asd_sas_phy *phy, enum phy_event event)
         BUG_ON(event >= PHY_NUM_EVENTS);
 
         sas_queue_event(event, &ha->event_lock, &phy->phy_events_pending,
-                        &phy->phy_events[event], ha->core.shost);
+                        &phy->phy_events[event].work, ha->core.shost);
 }
 
 int sas_init_events(struct sas_ha_struct *sas_ha)
 {
-        static void (*sas_ha_event_fns[HA_NUM_EVENTS])(void *) = {
+        static const work_func_t sas_ha_event_fns[HA_NUM_EVENTS] = {
                 [HAE_RESET] = sas_hae_reset,
         };
 
@@ -64,8 +64,10 @@ int sas_init_events(struct sas_ha_struct *sas_ha)
 
         spin_lock_init(&sas_ha->event_lock);
 
-        for (i = 0; i < HA_NUM_EVENTS; i++)
-                INIT_WORK(&sas_ha->ha_events[i], sas_ha_event_fns[i], sas_ha);
+        for (i = 0; i < HA_NUM_EVENTS; i++) {
+                INIT_WORK(&sas_ha->ha_events[i].work, sas_ha_event_fns[i]);
+                sas_ha->ha_events[i].ha = sas_ha;
+        }
 
         sas_ha->notify_ha_event = notify_ha_event;
         sas_ha->notify_port_event = notify_port_event;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index c836a237fb79..7b4e9169f44d 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -65,9 +65,11 @@ void sas_hash_addr(u8 *hashed, const u8 *sas_addr)
 
 /* ---------- HA events ---------- */
 
-void sas_hae_reset(void *data)
+void sas_hae_reset(struct work_struct *work)
 {
-        struct sas_ha_struct *ha = data;
+        struct sas_ha_event *ev =
+                container_of(work, struct sas_ha_event, work);
+        struct sas_ha_struct *ha = ev->ha;
 
         sas_begin_event(HAE_RESET, &ha->event_lock,
                         &ha->pending);
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index bffcee474921..137d7e496b6d 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -60,11 +60,11 @@ void sas_shutdown_queue(struct sas_ha_struct *sas_ha);
 
 void sas_deform_port(struct asd_sas_phy *phy);
 
-void sas_porte_bytes_dmaed(void *);
-void sas_porte_broadcast_rcvd(void *);
-void sas_porte_link_reset_err(void *);
-void sas_porte_timer_event(void *);
-void sas_porte_hard_reset(void *);
+void sas_porte_bytes_dmaed(struct work_struct *work);
+void sas_porte_broadcast_rcvd(struct work_struct *work);
+void sas_porte_link_reset_err(struct work_struct *work);
+void sas_porte_timer_event(struct work_struct *work);
+void sas_porte_hard_reset(struct work_struct *work);
 
 int sas_notify_lldd_dev_found(struct domain_device *);
 void sas_notify_lldd_dev_gone(struct domain_device *);
@@ -75,7 +75,7 @@ int sas_smp_get_phy_events(struct sas_phy *phy);
 
 struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy);
 
-void sas_hae_reset(void *);
+void sas_hae_reset(struct work_struct *work);
 
 static inline void sas_queue_event(int event, spinlock_t *lock,
                                    unsigned long *pending,
diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
index 9340cdbae4a3..b459c4b635b1 100644
--- a/drivers/scsi/libsas/sas_phy.c
+++ b/drivers/scsi/libsas/sas_phy.c
@@ -30,9 +30,11 @@
 
 /* ---------- Phy events ---------- */
 
-static void sas_phye_loss_of_signal(void *data)
+static void sas_phye_loss_of_signal(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PHYE_LOSS_OF_SIGNAL, &phy->ha->event_lock,
                         &phy->phy_events_pending);
@@ -40,18 +42,22 @@ static void sas_phye_loss_of_signal(void *data)
         sas_deform_port(phy);
 }
 
-static void sas_phye_oob_done(void *data)
+static void sas_phye_oob_done(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PHYE_OOB_DONE, &phy->ha->event_lock,
                         &phy->phy_events_pending);
         phy->error = 0;
 }
 
-static void sas_phye_oob_error(void *data)
+static void sas_phye_oob_error(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
         struct sas_ha_struct *sas_ha = phy->ha;
         struct asd_sas_port *port = phy->port;
         struct sas_internal *i =
@@ -80,9 +86,11 @@ static void sas_phye_oob_error(void *data)
         }
 }
 
-static void sas_phye_spinup_hold(void *data)
+static void sas_phye_spinup_hold(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
         struct sas_ha_struct *sas_ha = phy->ha;
         struct sas_internal *i =
                 to_sas_internal(sas_ha->core.shost->transportt);
@@ -100,14 +108,14 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
 {
         int i;
 
-        static void (*sas_phy_event_fns[PHY_NUM_EVENTS])(void *) = {
+        static const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS] = {
                 [PHYE_LOSS_OF_SIGNAL] = sas_phye_loss_of_signal,
                 [PHYE_OOB_DONE] = sas_phye_oob_done,
                 [PHYE_OOB_ERROR] = sas_phye_oob_error,
                 [PHYE_SPINUP_HOLD] = sas_phye_spinup_hold,
         };
 
-        static void (*sas_port_event_fns[PORT_NUM_EVENTS])(void *) = {
+        static const work_func_t sas_port_event_fns[PORT_NUM_EVENTS] = {
                 [PORTE_BYTES_DMAED] = sas_porte_bytes_dmaed,
                 [PORTE_BROADCAST_RCVD] = sas_porte_broadcast_rcvd,
                 [PORTE_LINK_RESET_ERR] = sas_porte_link_reset_err,
@@ -122,13 +130,18 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
 
                 phy->error = 0;
                 INIT_LIST_HEAD(&phy->port_phy_el);
-                for (k = 0; k < PORT_NUM_EVENTS; k++)
-                        INIT_WORK(&phy->port_events[k], sas_port_event_fns[k],
-                                  phy);
+                for (k = 0; k < PORT_NUM_EVENTS; k++) {
+                        INIT_WORK(&phy->port_events[k].work,
+                                  sas_port_event_fns[k]);
+                        phy->port_events[k].phy = phy;
+                }
+
+                for (k = 0; k < PHY_NUM_EVENTS; k++) {
+                        INIT_WORK(&phy->phy_events[k].work,
+                                  sas_phy_event_fns[k]);
+                        phy->phy_events[k].phy = phy;
+                }
 
-                for (k = 0; k < PHY_NUM_EVENTS; k++)
-                        INIT_WORK(&phy->phy_events[k], sas_phy_event_fns[k],
-                                  phy);
                 phy->port = NULL;
                 phy->ha = sas_ha;
                 spin_lock_init(&phy->frame_rcvd_lock);
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 253cdcf306a2..971c37ceecb4 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -181,9 +181,11 @@ void sas_deform_port(struct asd_sas_phy *phy)
 
 /* ---------- SAS port events ---------- */
 
-void sas_porte_bytes_dmaed(void *data)
+void sas_porte_bytes_dmaed(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PORTE_BYTES_DMAED, &phy->ha->event_lock,
                         &phy->port_events_pending);
@@ -191,11 +193,13 @@ void sas_porte_bytes_dmaed(void *data)
         sas_form_port(phy);
 }
 
-void sas_porte_broadcast_rcvd(void *data)
+void sas_porte_broadcast_rcvd(struct work_struct *work)
 {
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
         unsigned long flags;
         u32 prim;
-        struct asd_sas_phy *phy = data;
 
         sas_begin_event(PORTE_BROADCAST_RCVD, &phy->ha->event_lock,
                         &phy->port_events_pending);
@@ -208,9 +212,11 @@ void sas_porte_broadcast_rcvd(void *data)
         sas_discover_event(phy->port, DISCE_REVALIDATE_DOMAIN);
 }
 
-void sas_porte_link_reset_err(void *data)
+void sas_porte_link_reset_err(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PORTE_LINK_RESET_ERR, &phy->ha->event_lock,
                         &phy->port_events_pending);
@@ -218,9 +224,11 @@ void sas_porte_link_reset_err(void *data)
         sas_deform_port(phy);
 }
 
-void sas_porte_timer_event(void *data)
+void sas_porte_timer_event(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PORTE_TIMER_EVENT, &phy->ha->event_lock,
                         &phy->port_events_pending);
@@ -228,9 +236,11 @@ void sas_porte_timer_event(void *data)
         sas_deform_port(phy);
 }
 
-void sas_porte_hard_reset(void *data)
+void sas_porte_hard_reset(struct work_struct *work)
 {
-        struct asd_sas_phy *phy = data;
+        struct asd_sas_event *ev =
+                container_of(work, struct asd_sas_event, work);
+        struct asd_sas_phy *phy = ev->phy;
 
         sas_begin_event(PORTE_HARD_RESET, &phy->ha->event_lock,
                         &phy->port_events_pending);