scsi: core: Do not use DRIVER_INVALID

There is no point in returning DID_ABORT together with DRIVER_INVALID, as
the caller couldn't care less where the abort originated.  So drop the use
of DRIVER_INVALID.

Link: https://lore.kernel.org/r/20210427083046.31620-11-hare@suse.de
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index db4c7a7ff4dd50e1ff9c2773d34d7d8509b1c179..61cda7b7624fe7513be20b829d74abb4f4df67d9 100644 (file)
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -760,7 +760,7 @@ static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag,
                goto skip_resid;
 
        default:
-               scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;
+               scp->result = DID_ABORT << 16;
                break;
        }
 

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index f612505450250823061a9922ce8abacad7727454..6bb03d7a254dec3de935a244c04e2334df40c40a 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -1320,7 +1320,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
                }
                break;
        default:
-               scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+               scmd->result |= (DID_ABORT << 16);
                break;
        }
 
@@ -2127,7 +2127,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
        else
                atomic_dec(&mhba->fw_outstanding);
 
-       scmd->result = (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+       scmd->result = (DID_ABORT << 16);
        scmd->SCp.ptr = NULL;
        if (scsi_bufflen(scmd)) {
                dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index f0707eaad9f772bcc1cb5bfb3cfa5e07abf41009..f57f8bc037d2df635e223957d5e8e2ea11cf5bbe 100644 (file)
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -601,9 +601,6 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,
                case BTSTAT_LUNMISMATCH:
                case BTSTAT_TAGREJECT:
                case BTSTAT_BADMSG:
-                       cmd->result = (DRIVER_INVALID << 24);
-                       fallthrough;
-
                case BTSTAT_HAHARDWARE:
                case BTSTAT_INVPHASE:
                case BTSTAT_HATIMEOUT: