[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>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 3cd3b40b1a4c..3d2f71051fe5 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -201,7 +201,7 @@ static int nsp_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
 #ifdef NSP_DEBUG
         /*unsigned int host_id = SCpnt->device->host->this_id;*/
         /*unsigned int base    = SCpnt->device->host->io_port;*/
-        unsigned char target = SCpnt->device->id;
+        unsigned char target = scmd_id(SCpnt);
 #endif
         nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
 
@@ -373,7 +373,7 @@ static int nsphw_start_selection(Scsi_Cmnd *SCpnt)
 {
         unsigned int  host_id    = SCpnt->device->host->this_id;
         unsigned int  base       = SCpnt->device->host->io_port;
-        unsigned char target     = SCpnt->device->id;
+        unsigned char target     = scmd_id(SCpnt);
         nsp_hw_data  *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
         int           time_out;
         unsigned char phase, arbit;
@@ -452,7 +452,7 @@ static struct nsp_sync_table nsp_sync_table_20M[] = {
  */
 static int nsp_analyze_sdtr(Scsi_Cmnd *SCpnt)
 {
-        unsigned char          target = SCpnt->device->id;
+        unsigned char          target = scmd_id(SCpnt);
 //      unsigned char          lun    = SCpnt->device->lun;
         nsp_hw_data           *data   = (nsp_hw_data *)SCpnt->device->host->hostdata;
         sync_data             *sync   = &(data->Sync[target]);
@@ -677,7 +677,7 @@ static int nsp_reselected(Scsi_Cmnd *SCpnt)
                 target++;
         }
 
-        if (SCpnt->device->id != target) {
+        if (scmd_id(SCpnt) != target) {
                 nsp_msg(KERN_ERR, "XXX: reselect ID must be %d in this implementation.", target);
         }
 
@@ -912,7 +912,7 @@ static void nsp_pio_write(Scsi_Cmnd *SCpnt)
 static int nsp_nexus(Scsi_Cmnd *SCpnt)
 {
         unsigned int   base   = SCpnt->device->host->io_port;
-        unsigned char  target = SCpnt->device->id;
+        unsigned char  target = scmd_id(SCpnt);
 //      unsigned char  lun    = SCpnt->device->lun;
         nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
         sync_data     *sync   = &(data->Sync[target]);
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index b4b3a1a8a0c7..98b64b2aa8ee 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -610,7 +610,7 @@ SYM53C500_queue(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 
         /* We are locked here already by the mid layer */
         REG0(port_base);
-        outb(SCpnt->device->id, port_base + DEST_ID);   /* set destination */
+        outb(scmd_id(SCpnt), port_base + DEST_ID);      /* set destination */
         outb(FLUSH_FIFO, port_base + CMD_REG);  /* reset the fifos */
 
         for (i = 0; i < SCpnt->cmd_len; i++) {