scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16

SPC-3 defines SERVICE ACTION IN(12) and SERVICE ACTION IN(16).
So rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16 to be
consistent with SPC and to allow for better distinction.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Tested-by: Robert Elliott <elliott@hp.com>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

2 files changed, 3 insertions, 3 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))