1 files changed, 9 insertions, 35 deletions

diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
index cdee446c29e1..59f82929b0a3 100644
--- a/drivers/scsi/libsas/sas_phy.c
+++ b/drivers/scsi/libsas/sas_phy.c
@@ -35,7 +35,6 @@ static void sas_phye_loss_of_signal(struct work_struct *work)
         struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
-        clear_bit(PHYE_LOSS_OF_SIGNAL, &phy->phy_events_pending);
         phy->error = 0;
         sas_deform_port(phy, 1);
 }
@@ -45,7 +44,6 @@ static void sas_phye_oob_done(struct work_struct *work)
         struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
-        clear_bit(PHYE_OOB_DONE, &phy->phy_events_pending);
         phy->error = 0;
 }
 
@@ -58,8 +56,6 @@ static void sas_phye_oob_error(struct work_struct *work)
         struct sas_internal *i =
                 to_sas_internal(sas_ha->core.shost->transportt);
 
-        clear_bit(PHYE_OOB_ERROR, &phy->phy_events_pending);
-
         sas_deform_port(phy, 1);
 
         if (!port && phy->enabled && i->dft->lldd_control_phy) {
@@ -88,8 +84,6 @@ static void sas_phye_spinup_hold(struct work_struct *work)
         struct sas_internal *i =
                 to_sas_internal(sas_ha->core.shost->transportt);
 
-        clear_bit(PHYE_SPINUP_HOLD, &phy->phy_events_pending);
-
         phy->error = 0;
         i->dft->lldd_control_phy(phy, PHY_FUNC_RELEASE_SPINUP_HOLD, NULL);
 }
@@ -99,8 +93,6 @@ static void sas_phye_resume_timeout(struct work_struct *work)
         struct asd_sas_event *ev = to_asd_sas_event(work);
         struct asd_sas_phy *phy = ev->phy;
 
-        clear_bit(PHYE_RESUME_TIMEOUT, &phy->phy_events_pending);
-
         /* phew, lldd got the phy back in the nick of time */
         if (!phy->suspended) {
                 dev_info(&phy->phy->dev, "resume timeout cancelled\n");
@@ -119,39 +111,12 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
 {
         int i;
 
-        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,
-                [PHYE_RESUME_TIMEOUT] = sas_phye_resume_timeout,
-
-        };
-
-        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,
-                [PORTE_TIMER_EVENT] = sas_porte_timer_event,
-                [PORTE_HARD_RESET] = sas_porte_hard_reset,
-        };
-
         /* Now register the phys. */
         for (i = 0; i < sas_ha->num_phys; i++) {
-                int k;
                 struct asd_sas_phy *phy = sas_ha->sas_phy[i];
 
                 phy->error = 0;
                 INIT_LIST_HEAD(&phy->port_phy_el);
-                for (k = 0; k < PORT_NUM_EVENTS; k++) {
-                        INIT_SAS_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_SAS_WORK(&phy->phy_events[k].work, sas_phy_event_fns[k]);
-                        phy->phy_events[k].phy = phy;
-                }
 
                 phy->port = NULL;
                 phy->ha = sas_ha;
@@ -179,3 +144,12 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
 
         return 0;
 }
+
+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,
+        [PHYE_RESUME_TIMEOUT] = sas_phye_resume_timeout,
+
+};