[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/nsp32.c b/drivers/scsi/nsp32.c
index 6367f009cd74..e4ff4f00676d 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -481,7 +481,7 @@ static int nsp32_selection_autopara(struct scsi_cmnd *SCpnt)
         nsp32_hw_data  *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
         unsigned int    base    = SCpnt->device->host->io_port;
         unsigned int    host_id = SCpnt->device->host->this_id;
-        unsigned char   target  = SCpnt->device->id;
+        unsigned char   target  = scmd_id(SCpnt);
         nsp32_autoparam *param  = data->autoparam;
         unsigned char   phase;
         int             i, ret;
@@ -612,7 +612,7 @@ static int nsp32_selection_autoscsi(struct scsi_cmnd *SCpnt)
         nsp32_hw_data  *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
         unsigned int    base    = SCpnt->device->host->io_port;
         unsigned int    host_id = SCpnt->device->host->this_id;
-        unsigned char   target  = SCpnt->device->id;
+        unsigned char   target  = scmd_id(SCpnt);
         unsigned char   phase;
         int             status;
         unsigned short  command = 0;
@@ -973,7 +973,7 @@ static int nsp32_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
         }
 
         /* check target ID is not same as this initiator ID */
-        if (SCpnt->device->id == SCpnt->device->host->this_id) {
+        if (scmd_id(SCpnt) == SCpnt->device->host->this_id) {
                 nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "terget==host???");
                 SCpnt->result = DID_BAD_TARGET << 16;
                 done(SCpnt);
@@ -1028,7 +1028,7 @@ static int nsp32_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
          * (target don't have SDTR_DONE and SDTR_INITIATOR), sync
          * message SDTR is needed to do synchronous transfer.
          */
-        target = &data->target[SCpnt->device->id];
+        target = &data->target[scmd_id(SCpnt)];
         data->cur_target = target;
 
         if (!(target->sync_flag & (SDTR_DONE | SDTR_INITIATOR | SDTR_TARGET))) {