scsi: NCR5380: Move bus reset to host reset

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

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index a75feeb..89f5154 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -671,7 +671,7 @@ static void atari_scsi_falcon_reg_write(unsigned int reg, u8 value)
 
 #include "NCR5380.c"
 
-static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
+static int atari_scsi_host_reset(struct scsi_cmnd *cmd)
 {
        int rv;
        unsigned long flags;
@@ -688,7 +688,7 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
                atari_dma_orig_addr = NULL;
        }
 
-       rv = NCR5380_bus_reset(cmd);
+       rv = NCR5380_host_reset(cmd);
 
        /* The 5380 raises its IRQ line while _RST is active but the ST DMA
         * "lock" has been released so this interrupt may end up handled by
@@ -711,7 +711,7 @@ static struct scsi_host_template atari_scsi_template = {
        .info                   = atari_scsi_info,
        .queuecommand           = atari_scsi_queue_command,
        .eh_abort_handler       = atari_scsi_abort,
-       .eh_bus_reset_handler   = atari_scsi_bus_reset,
+       .eh_host_reset_handler  = atari_scsi_host_reset,
        .this_id                = 7,
        .cmd_per_lun            = 2,
        .use_clustering         = DISABLE_CLUSTERING,