scsi: NCR5380: Reduce goto statements in NCR5380_select()

commit 6a162836997c10bbefb7c7ca772201cc45c0e4a6 upstream.

Replace a 'goto' statement with a simple 'return' where possible.  This
improves readability. No functional change.

Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 90ea0f5..9e67b83 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -984,7 +984,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
        if (!hostdata->selecting) {
                /* Command was aborted */
                NCR5380_write(MODE_REG, MR_BASE);
-               goto out;
+               return NULL;
        }
        if (err < 0) {
                NCR5380_write(MODE_REG, MR_BASE);
@@ -1033,7 +1033,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
        if (!hostdata->selecting) {
                NCR5380_write(MODE_REG, MR_BASE);
                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-               goto out;
+               return NULL;
        }
 
        dsprintk(NDEBUG_ARBITRATION, instance, "won arbitration\n");
@@ -1116,13 +1116,16 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
                spin_lock_irq(&hostdata->lock);
                NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
                NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
+
                /* Can't touch cmd if it has been reclaimed by the scsi ML */
-               if (hostdata->selecting) {
-                       cmd->result = DID_BAD_TARGET << 16;
-                       complete_cmd(instance, cmd);
-                       dsprintk(NDEBUG_SELECTION, instance, "target did not respond within 250ms\n");
-                       cmd = NULL;
-               }
+               if (!hostdata->selecting)
+                       return NULL;
+
+               cmd->result = DID_BAD_TARGET << 16;
+               complete_cmd(instance, cmd);
+               dsprintk(NDEBUG_SELECTION, instance,
+                       "target did not respond within 250ms\n");
+               cmd = NULL;
                goto out;
        }
 
@@ -1155,7 +1158,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
        }
        if (!hostdata->selecting) {
                do_abort(instance);
-               goto out;
+               return NULL;
        }
 
        dsprintk(NDEBUG_SELECTION, instance, "target %d selected, going into MESSAGE OUT phase.\n",