Changes to the NCR5380 driver between 2.6.9 and 2.6.10 replaced the
driver's home-grown delayed work implementation with a call to
schedule_delayed_work().  However, the delay argument was not passed
correctly, so the work was usually scheduled for _way_ too far in
the future.  This patch fixes this.

NCR5380_print_status() is called from NCR5380_abort() and from
NCR5380_bus_reset().  In at least the abort() case, the host lock
has already been acquired by scsi_error.c:scsi_try_to_abort_command().
NCR5380_print_status() calls NCR5380_proc_info() which also acquires
and releases the host lock.  This patch removes the call to
NCR5380_proc_info() from NCR5380_print_status.

Cosmetic: Remove duplicated lines of code from NCR5380_abort().
Signed-off-by: Kenn Humborg <kenn@linux.ie>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>