scsi: nsp32: drop bus reset

bus reset is a host reset without nsp32hw_init(), and will always return
SUCCESS, thus disabling the use of host reset.  So drop bus reset in
favour of host reset.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 53c84771f0e8939f53e561cad198c40ac337c2f2..107e191bf0239eb55475f84a4494111bba7a9cd8 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -201,7 +201,6 @@ static int         nsp32_release     (struct Scsi_Host *);
 
 /* SCSI error handler */
 static int         nsp32_eh_abort     (struct scsi_cmnd *);
-static int         nsp32_eh_bus_reset (struct scsi_cmnd *);
 static int         nsp32_eh_host_reset(struct scsi_cmnd *);
 
 /* generate SCSI message */
@@ -276,8 +275,7 @@ static struct scsi_host_template nsp32_template = {
        .max_sectors                    = 128,
        .this_id                        = NSP32_HOST_SCSIID,
        .use_clustering                 = DISABLE_CLUSTERING,
-       .eh_abort_handler               = nsp32_eh_abort,
-       .eh_bus_reset_handler           = nsp32_eh_bus_reset,
+       .eh_abort_handler               = nsp32_eh_abort,
        .eh_host_reset_handler          = nsp32_eh_host_reset,
 /*     .highmem_io                     = 1, */
 };
@@ -2845,24 +2843,6 @@ static int nsp32_eh_abort(struct scsi_cmnd *SCpnt)
        return SUCCESS;
 }
 
-static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt)
-{
-       nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
-       unsigned int   base = SCpnt->device->host->io_port;
-
-       spin_lock_irq(SCpnt->device->host->host_lock);
-
-       nsp32_msg(KERN_INFO, "Bus Reset");      
-       nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt);
-
-       nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK);
-       nsp32_do_bus_reset(data);
-       nsp32_write2(base, IRQ_CONTROL, 0);
-
-       spin_unlock_irq(SCpnt->device->host->host_lock);
-       return SUCCESS; /* SCSI bus reset is succeeded at any time. */
-}
-
 static void nsp32_do_bus_reset(nsp32_hw_data *data)
 {
        unsigned int   base = data->BaseAddress;