Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 9176bfb..61aadc7 100644 (file)
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -147,22 +147,6 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
        }
 }
 
-static int a2091_bus_reset(struct scsi_cmnd *cmd)
-{
-       struct Scsi_Host *instance = cmd->device->host;
-
-       /* FIXME perform bus-specific reset */
-
-       /* FIXME 2: kill this function, and let midlayer fall back
-          to the same action, calling wd33c93_host_reset() */
-
-       spin_lock_irq(instance->host_lock);
-       wd33c93_host_reset(cmd);
-       spin_unlock_irq(instance->host_lock);
-
-       return SUCCESS;
-}
-
 static struct scsi_host_template a2091_scsi_template = {
        .module                 = THIS_MODULE,
        .name                   = "Commodore A2091/A590 SCSI",
@@ -171,7 +155,6 @@ static struct scsi_host_template a2091_scsi_template = {
        .proc_name              = "A2901",
        .queuecommand           = wd33c93_queuecommand,
        .eh_abort_handler       = wd33c93_abort,
-       .eh_bus_reset_handler   = a2091_bus_reset,
        .eh_host_reset_handler  = wd33c93_host_reset,
        .can_queue              = CAN_QUEUE,
        .this_id                = 7,