scsi: libsas: Remove notifier indirection

[linux-2.6-microblaze.git] / drivers / scsi / aic94xx / aic94xx_scb.c

diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 1367797..7705461 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -68,7 +68,6 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb,
                                         struct done_list_struct *dl)
 {
        struct asd_ha_struct *asd_ha = ascb->ha;
-       struct sas_ha_struct *sas_ha = &asd_ha->sas_ha;
        int phy_id = dl->status_block[0] & DL_PHY_MASK;
        struct asd_phy *phy = &asd_ha->phys[phy_id];
 
@@ -81,7 +80,7 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb,
                ASD_DPRINTK("phy%d: device unplugged\n", phy_id);
                asd_turn_led(asd_ha, phy_id, 0);
                sas_phy_disconnected(&phy->sas_phy);
-               sas_ha->notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL);
+               sas_notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL);
                break;
        case CURRENT_OOB_DONE:
                /* hot plugged device */
@@ -89,12 +88,12 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb,
                get_lrate_mode(phy, oob_mode);
                ASD_DPRINTK("phy%d device plugged: lrate:0x%x, proto:0x%x\n",
                            phy_id, phy->sas_phy.linkrate, phy->sas_phy.iproto);
-               sas_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE);
+               sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE);
                break;
        case CURRENT_SPINUP_HOLD:
                /* hot plug SATA, no COMWAKE sent */
                asd_turn_led(asd_ha, phy_id, 1);
-               sas_ha->notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD);
+               sas_notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD);
                break;
        case CURRENT_GTO_TIMEOUT:
        case CURRENT_OOB_ERROR:
@@ -102,7 +101,7 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb,
                            dl->status_block[1]);
                asd_turn_led(asd_ha, phy_id, 0);
                sas_phy_disconnected(&phy->sas_phy);
-               sas_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR);
+               sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR);
                break;
        }
 }
@@ -222,7 +221,6 @@ static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb,
        int edb_el = edb_id + ascb->edb_index;
        struct asd_dma_tok *edb = ascb->ha->seq.edb_arr[edb_el];
        struct asd_phy *phy = &ascb->ha->phys[phy_id];
-       struct sas_ha_struct *sas_ha = phy->sas_phy.ha;
        u16 size = ((dl->status_block[3] & 7) << 8) | dl->status_block[2];
 
        size = min(size, (u16) sizeof(phy->frame_rcvd));
@@ -234,7 +232,7 @@ static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb,
        spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags);
        asd_dump_frame_rcvd(phy, dl);
        asd_form_port(ascb->ha, phy);
-       sas_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED);
+       sas_notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED);
 }
 
 static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
@@ -270,7 +268,7 @@ static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
        asd_turn_led(asd_ha, phy_id, 0);
        sas_phy_disconnected(sas_phy);
        asd_deform_port(asd_ha, phy);
-       sas_ha->notify_port_event(sas_phy, PORTE_LINK_RESET_ERR);
+       sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR);
 
        if (retries_left == 0) {
                int num = 1;
@@ -315,7 +313,7 @@ static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb,
                        spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
                        sas_phy->sas_prim = ffs(cont);
                        spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
-                       sas_ha->notify_port_event(sas_phy,PORTE_BROADCAST_RCVD);
+                       sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);
                        break;
 
                case LmUNKNOWNP:
@@ -336,7 +334,7 @@ static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb,
                        /* The sequencer disables all phys on that port.
                         * We have to re-enable the phys ourselves. */
                        asd_deform_port(asd_ha, phy);
-                       sas_ha->notify_port_event(sas_phy, PORTE_HARD_RESET);
+                       sas_notify_port_event(sas_phy, PORTE_HARD_RESET);
                        break;
 
                default:
@@ -567,7 +565,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                /* the device is gone */
                sas_phy_disconnected(sas_phy);
                asd_deform_port(asd_ha, phy);
-               sas_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);
+               sas_notify_port_event(sas_phy, PORTE_TIMER_EVENT);
                break;
        default:
                ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __func__,