scsi: drop bus reset for wd33c93-compatible boards
The bus reset function is just a wrapper calling host reset under the host lock. So move taking of the host lock into the host reset function and drop bus reset. Signed-off-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:

committed by
Martin K. Petersen

parent
63cd2f7f90
commit
ec05e23896
@@ -162,22 +162,6 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
|
||||
}
|
||||
}
|
||||
|
||||
static int a3000_bus_reset(struct scsi_cmnd *cmd)
|
||||
{
|
||||
struct Scsi_Host *instance = cmd->device->host;
|
||||
|
||||
/* FIXME perform bus-specific reset */
|
||||
|
||||
/* FIXME 2: kill this entire function, which should
|
||||
cause mid-layer to call wd33c93_host_reset anyway? */
|
||||
|
||||
spin_lock_irq(instance->host_lock);
|
||||
wd33c93_host_reset(cmd);
|
||||
spin_unlock_irq(instance->host_lock);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static struct scsi_host_template amiga_a3000_scsi_template = {
|
||||
.module = THIS_MODULE,
|
||||
.name = "Amiga 3000 built-in SCSI",
|
||||
@@ -186,7 +170,6 @@ static struct scsi_host_template amiga_a3000_scsi_template = {
|
||||
.proc_name = "A3000",
|
||||
.queuecommand = wd33c93_queuecommand,
|
||||
.eh_abort_handler = wd33c93_abort,
|
||||
.eh_bus_reset_handler = a3000_bus_reset,
|
||||
.eh_host_reset_handler = wd33c93_host_reset,
|
||||
.can_queue = CAN_QUEUE,
|
||||
.this_id = 7,
|
||||
|
Reference in New Issue
Block a user