atari_NCR5380: Remove RESET_RUN_DONE macro

There's no need to run the cmd->done callback for aborted commands. Remove
the old EH code and the RESET_RUN_DONE macro.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index f1f9f479452798604fbc105e13bc097dcec1ee3a..bdaaa86a77b9dc392981d29e08a5bfb58503061e 100644 (file)
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -2876,9 +2876,6 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
        struct NCR5380_hostdata *hostdata = shost_priv(instance);
        int i;
        unsigned long flags;
-#if defined(RESET_RUN_DONE)
-       struct scsi_cmnd *connected, *disconnected_queue;
-#endif
 
        NCR5380_print_status(instance);
 
@@ -2897,89 +2894,6 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
         * through anymore ... */
        (void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
 
-       /* MSch 20140115 - looking at the generic NCR5380 driver, all of this
-        * should go.
-        * Catch-22: if we don't clear all queues, the SCSI driver lock will
-        * not be reset by atari_scsi_reset()!
-        */
-
-#if defined(RESET_RUN_DONE)
-       /* XXX Should now be done by midlevel code, but it's broken XXX */
-       /* XXX see below                                            XXX */
-
-       /* MSch: old-style reset: actually abort all command processing here */
-
-       /* After the reset, there are no more connected or disconnected commands
-        * and no busy units; to avoid problems with re-inserting the commands
-        * into the issue_queue (via scsi_done()), the aborted commands are
-        * remembered in local variables first.
-        */
-       local_irq_save(flags);
-       connected = (struct scsi_cmnd *)hostdata->connected;
-       hostdata->connected = NULL;
-       disconnected_queue = (struct scsi_cmnd *)hostdata->disconnected_queue;
-       hostdata->disconnected_queue = NULL;
-#ifdef SUPPORT_TAGS
-       free_all_tags();
-#endif
-       for (i = 0; i < 8; ++i)
-               hostdata->busy[i] = 0;
-#ifdef REAL_DMA
-       hostdata->dma_len = 0;
-#endif
-       local_irq_restore(flags);
-
-       /* In order to tell the mid-level code which commands were aborted,
-        * set the command status to DID_RESET and call scsi_done() !!!
-        * This ultimately aborts processing of these commands in the mid-level.
-        */
-
-       if ((cmd = connected)) {
-               dprintk(NDEBUG_ABORT, "scsi%d: reset aborted a connected command\n", H_NO(cmd));
-               cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
-               cmd->scsi_done(cmd);
-       }
-
-       for (i = 0; (cmd = disconnected_queue); ++i) {
-               disconnected_queue = NEXT(cmd);
-               SET_NEXT(cmd, NULL);
-               cmd->result = (cmd->result & 0xffff) | (DID_RESET << 16);
-               cmd->scsi_done(cmd);
-       }
-       if (i > 0)
-               dprintk(NDEBUG_ABORT, "scsi: reset aborted %d disconnected command(s)\n", i);
-
-       /* The Falcon lock should be released after a reset...
-        */
-       /* ++guenther: moved to atari_scsi_reset(), to prevent a race between
-        * unlocking and enabling dma interrupt.
-        */
-/*     falcon_release_lock_if_possible( hostdata );*/
-
-       /* since all commands have been explicitly terminated, we need to tell
-        * the midlevel code that the reset was SUCCESSFUL, and there is no
-        * need to 'wake up' the commands by a request_sense
-        */
-       return SUCCESS;
-#else /* 1 */
-
-       /* MSch: new-style reset handling: let the mid-level do what it can */
-
-       /* ++guenther: MID-LEVEL IS STILL BROKEN.
-        * Mid-level is supposed to requeue all commands that were active on the
-        * various low-level queues. In fact it does this, but that's not enough
-        * because all these commands are subject to timeout. And if a timeout
-        * happens for any removed command, *_abort() is called but all queues
-        * are now empty. Abort then gives up the falcon lock, which is fatal,
-        * since the mid-level will queue more commands and must have the lock
-        * (it's all happening inside timer interrupt handler!!).
-        * Even worse, abort will return NOT_RUNNING for all those commands not
-        * on any queue, so they won't be retried ...
-        *
-        * Conclusion: either scsi.c disables timeout for all resetted commands
-        * immediately, or we lose!  As of linux-2.0.20 it doesn't.
-        */
-
        /* After the reset, there are no more connected or disconnected commands
         * and no busy units; so clear the low-level status here to avoid
         * conflicts when the mid-level code tries to wake up the affected
@@ -3009,7 +2923,5 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
        maybe_release_dma_irq(instance);
        local_irq_restore(flags);
 
-       /* we did no complete reset of all commands, so a wakeup is required */
        return SUCCESS;
-#endif /* 1 */
 }

diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index a98c7325f2dda6f6115f90922622c88d6fed4dcd..2a906d1d34baa87703e0541b93ba8512bf09eddf 100644 (file)
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -39,7 +39,6 @@
 /* Definitions for the core NCR5380 driver. */
 
 #define REAL_DMA
-#define RESET_RUN_DONE
 /* #define SUPPORT_TAGS */
 /* minimum number of bytes to do dma on */
 #define DMA_MIN_SIZE                    129