[SCSI] use scmd_id(), scmd_channel() throughout code

Wrap a highly common idiom.  Makes the code easier to read, helps pave
the way for sdev->{id,channel} removal, and adds a token that can easily
by grepped-for in the future.

There are a couple sdev_id() and scmd_printk() updates thrown in as well.

Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index acc3d9209879..2a128a156aa1 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1464,7 +1464,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
          *      Test does not apply to ID 16, the pseudo id for the controller
          *      itself.
          */
-        if (scsicmd->device->id != host->this_id) {
+        if (scmd_id(scsicmd) != host->this_id) {
                 if ((scsicmd->device->channel == 0) ){
                         if( (scsicmd->device->id >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)){ 
                                 scsicmd->result = DID_NO_CONNECT << 16;
@@ -1559,7 +1559,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                  *      Set the Vendor, Product, and Revision Level
                  *      see: <vendor>.c i.e. aac.c
                  */
-                if (scsicmd->device->id == host->this_id) {
+                if (scmd_id(scsicmd) == host->this_id) {
                         setinqstr(dev, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
                         inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
                         aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
@@ -1949,7 +1949,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                          * the channel is 2
                          */
                         } else if ((dev->raid_scsi_mode) &&
-                                        (scsicmd->device->channel == 2)) {
+                                        (scmd_channel(scsicmd) == 2)) {
                                 scsicmd->result = DID_OK << 16 | 
                                                 COMMAND_COMPLETE << 8;
                         } else {
@@ -1993,7 +1993,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                          * the channel is 2
                          */
                         } else if ((dev->raid_scsi_mode) &&
-                                        (scsicmd->device->channel == 2)) {
+                                        (scmd_channel(scsicmd) == 2)) {
                                 scsicmd->result = DID_OK << 16 | 
                                                 COMMAND_COMPLETE << 8;
                         } else {