[PATCH v1 2/6] scsi: drop the duplicate COMPARE and SEND DIAGNOSTIC opcodes

[Aristo Chen <aristo.chen@canonical.com>]

SCSI_COMPARE and SCSI_SEND_DIAG are defined in the table of commands
for all device types and again in the table of commands unique to
direct access devices. SCSI-2 (table 31) lists both as commands for all
device types, so drop the copies from the second table.

The two SCSI_SEND_DIAG copies also disagreed on the command type: the
first said optional, the second mandatory. SCSI-2 names SEND DIAGNOSTIC
as one of the four commands every target implements, together with
INQUIRY, REQUEST SENSE and TEST UNIT READY, so the remaining comment now
says mandatory, as the other three do.

No functional change.

Signed-off-by: Aristo Chen <aristo.chen@canonical.com>
---
 include/scsi.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/scsi.h b/include/scsi.h
index 2520a8b8fe6..93561749b7f 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -144,13 +144,12 @@ struct scsi_cmd {
 #define SCSI_MODE_SEN10	0x5A		/* Mode Sense 10-byte (Device Specific) */
 #define SCSI_READ_BUFF	0x3C		/* Read Buffer (O) */
 #define SCSI_REQ_SENSE	0x03		/* Request Sense (MANDATORY) */
-#define SCSI_SEND_DIAG	0x1D		/* Send Diagnostic (O) */
+#define SCSI_SEND_DIAG	0x1D		/* Send Diagnostic (MANDATORY) */
 #define SCSI_TST_U_RDY	0x00		/* Test Unit Ready (MANDATORY) */
 #define SCSI_WRITE_BUFF	0x3B		/* Write Buffer (O) */
 /***************************************************************************
  *			  %%% Commands Unique to Direct Access Devices %%%
  ***************************************************************************/
-#define SCSI_COMPARE		0x39		/* Compare (O) */
 #define SCSI_FORMAT		0x04		/* Format Unit (MANDATORY) */
 #define SCSI_LCK_UN_CAC	0x36		/* Lock Unlock Cache (O) */
 #define SCSI_PREFETCH	0x34		/* Prefetch (O) */
@@ -172,7 +171,6 @@ struct scsi_cmd {
 #define SCSI_SRCH_DAT_L	0x32		/* Search Data Low (O) */
 #define SCSI_SEEK6		0x0B		/* Seek 6-Byte (O) */
 #define SCSI_SEEK10		0x2B		/* Seek 10-Byte (O) */
-#define SCSI_SEND_DIAG	0x1D		/* Send Diagnostics (MANDATORY) */
 #define SCSI_SET_LIMIT	0x33		/* Set Limits (O) */
 #define SCSI_START_STP	0x1B		/* Start/Stop Unit (O) */
 #define SCSI_SYNC_CACHE	0x35		/* Synchronize Cache (O) */
-- 
2.43.0