7 files changed, 8 insertions, 9 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 681434e2dfe9..b32e77db0c48 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -2181,7 +2181,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                           (fsa_dev_ptr[cid].sense_data.sense_key ==
                            NOT_READY)) {
                                 switch (scsicmd->cmnd[0]) {
-                                case SERVICE_ACTION_IN:
+                                case SERVICE_ACTION_IN_16:
                                         if (!(dev->raw_io_interface) ||
                                             !(dev->raw_io_64) ||
                                             ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
@@ -2309,7 +2309,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 scsi_sg_copy_from_buffer(scsicmd, &inq_data, sizeof(inq_data));
                 return aac_get_container_name(scsicmd);
         }
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                 if (!(dev->raw_io_interface) ||
                     !(dev->raw_io_64) ||
                     ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 41b9c68bca67..4c340d88c33d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -555,7 +555,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd)
                 AAC_DRIVERNAME,
                 host->host_no, sdev_channel(dev), sdev_id(dev), dev->lun);
         switch (cmd->cmnd[0]) {
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                 if (!(aac->raw_io_interface) ||
                     !(aac->raw_io_64) ||
                     ((cmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 0cf43f6e464b..52afabd23d9f 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -24,7 +24,6 @@
 #define SERVICE_ACTION_IN_12 0xab
 #define SERVICE_ACTION_OUT_12 0xa9
 #define SERVICE_ACTION_BIDIRECTIONAL 0x9d
-#define SERVICE_ACTION_IN_16 0x9e
 #define SERVICE_ACTION_OUT_16 0x9f
 #define THIRD_PARTY_COPY_OUT 0x83
 #define THIRD_PARTY_COPY_IN 0x84
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 4ebbeae161e2..71e138044379 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -2159,7 +2159,7 @@ static void gdth_next(gdth_ha_str *ha)
               case VERIFY:
               case START_STOP:
               case MODE_SENSE:
-              case SERVICE_ACTION_IN:
+              case SERVICE_ACTION_IN_16:
                 TRACE(("cache cmd %x/%x/%x/%x/%x/%x\n",nscp->cmnd[0],
                        nscp->cmnd[1],nscp->cmnd[2],nscp->cmnd[3],
                        nscp->cmnd[4],nscp->cmnd[5]));
@@ -2391,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)
         gdth_copy_internal_data(ha, scp, (char*)&rdc, sizeof(gdth_rdcap_data));
         break;
 
-      case SERVICE_ACTION_IN:
+      case SERVICE_ACTION_IN_16:
         if ((scp->cmnd[1] & 0x1f) == SAI_READ_CAPACITY_16 &&
             (ha->cache_feat & GDT_64BIT)) {
             gdth_rdcap16_data rdc16;
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index b02571390d01..378e0aae29ca 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -4210,7 +4210,7 @@ scsi_debug_queuecommand(struct scsi_cmnd *SCpnt)
         case READ_CAPACITY:
                 errsts = resp_readcap(SCpnt, devip);
                 break;
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                 if (cmd[1] == SAI_READ_CAPACITY_16)
                         errsts = resp_readcap16(SCpnt, devip);
                 else if (cmd[1] == SAI_GET_LBA_STATUS) {
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 503594e5f76d..82af28b90294 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -278,7 +278,7 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
                 return scsi_trace_rw16(p, cdb, len);
         case UNMAP:
                 return scsi_trace_unmap(p, cdb, len);
-        case SERVICE_ACTION_IN:
+        case SERVICE_ACTION_IN_16:
                 return scsi_trace_service_action_in(p, cdb, len);
         case VARIABLE_LENGTH_CMD:
                 return scsi_trace_varlen(p, cdb, len);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 54abcb220ab4..fedab3c21ddf 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1982,7 +1982,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
 
         do {
                 memset(cmd, 0, 16);
-                cmd[0] = SERVICE_ACTION_IN;
+                cmd[0] = SERVICE_ACTION_IN_16;
                 cmd[1] = SAI_READ_CAPACITY_16;
                 cmd[13] = RC16_LEN;
                 memset(buffer, 0, RC16_LEN);