[SCSI] aic79xx: ahd_linux_dev_reset() cleanup
Use the macros consistently in ahd_linux_dev_reset(). If ahd_linux_dev_reset() really can be called with local interrupts disabled then yuk. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
ace4e7185d
commit
cc33895abb
|
@ -1553,7 +1553,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
|
||||||
ahd_queue_scb(ahd, scb);
|
ahd_queue_scb(ahd, scb);
|
||||||
|
|
||||||
scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
|
scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
|
||||||
spin_unlock_irq(&ahd->platform_data->spin_lock);
|
ahd_unlock(ahd, &s);
|
||||||
init_timer(&timer);
|
init_timer(&timer);
|
||||||
timer.data = (u_long)scb;
|
timer.data = (u_long)scb;
|
||||||
timer.expires = jiffies + (5 * HZ);
|
timer.expires = jiffies + (5 * HZ);
|
||||||
|
@ -1567,7 +1567,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
|
||||||
printf("Timer Expired\n");
|
printf("Timer Expired\n");
|
||||||
retval = FAILED;
|
retval = FAILED;
|
||||||
}
|
}
|
||||||
spin_lock_irq(&ahd->platform_data->spin_lock);
|
ahd_lock(ahd, &s);
|
||||||
ahd_schedule_runq(ahd);
|
ahd_schedule_runq(ahd);
|
||||||
ahd_linux_run_complete_queue(ahd);
|
ahd_linux_run_complete_queue(ahd);
|
||||||
ahd_unlock(ahd, &s);
|
ahd_unlock(ahd, &s);
|
||||||
|
|
Loading…
Reference in a new issue