]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
scsi: acornscsi: Use standard defines
authorHannes Reinecke <hare@suse.de>
Wed, 13 Jan 2021 09:04:35 +0000 (10:04 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 23 Jan 2021 02:14:09 +0000 (21:14 -0500)
Use midlayer-defined values and drop the non-existing QUEUE_FULL case; we
are checking the SCSI messages in the switch statement, and QUEUE_FULL is a
SCSI status hence it can never occur here.

Link: https://lore.kernel.org/r/20210113090500.129644-11-hare@suse.de
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>
drivers/scsi/arm/acornscsi.c

index 9a912fd0f70b5563107b39cd63c84d389155df24..248a5bfad153a7dfc8ea48885eab69f142e02317 100644 (file)
 #define VER_MINOR 0
 #define VER_PATCH 6
 
-#ifndef ABORT_TAG
-#define ABORT_TAG 0xd
-#else
-#error "Yippee!  ABORT TAG is now defined!  Remove this error!"
-#endif
-
 #ifdef USE_DMAC
 /*
  * DMAC setup parameters
@@ -1490,8 +1484,8 @@ void acornscsi_message(AS_Host *host)
     }
 
     switch (message[0]) {
-    case ABORT:
-    case ABORT_TAG:
+    case ABORT_TASK_SET:
+    case ABORT_TASK:
     case COMMAND_COMPLETE:
        if (host->scsi.phase != PHASE_STATUSIN) {
            printk(KERN_ERR "scsi%d.%c: command complete following non-status in phase?\n",
@@ -1596,10 +1590,6 @@ void acornscsi_message(AS_Host *host)
        }
        break;
 
-    case QUEUE_FULL:
-       /* TODO: target queue is full */
-       break;
-
     case SIMPLE_QUEUE_TAG:
        /* tag queue reconnect... message[1] = queue tag.  Print something to indicate something happened! */
        printk("scsi%d.%c: reconnect queue tag %02X\n",