[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, 11 insertions, 11 deletions

diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index b150bd8e254a..5227a779c05c 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -621,10 +621,10 @@ static int atp870u_queuecommand(struct scsi_cmnd * req_p,
         struct atp_unit *dev;
         struct Scsi_Host *host;
 
-        c = req_p->device->channel;     
+        c = scmd_channel(req_p);
         req_p->sense_buffer[0]=0;
         req_p->resid = 0;
-        if (req_p->device->channel > 1) {
+        if (scmd_channel(req_p) > 1) {
                 req_p->result = 0x00040000;
                 done(req_p);
 #ifdef ED_DBGP          
@@ -639,7 +639,7 @@ static int atp870u_queuecommand(struct scsi_cmnd * req_p,
 
                 
         m = 1;
-        m = m << req_p->device->id;
+        m = m << scmd_id(req_p);
 
         /*
          *      Fake a timeout for missing targets
@@ -757,9 +757,9 @@ static void send_s870(struct atp_unit *dev,unsigned char c)
                 dev->quhd[c] = 0;
         }
         workreq = dev->quereq[c][dev->quhd[c]];
-        if (dev->id[c][workreq->device->id].curr_req == 0) {    
-                dev->id[c][workreq->device->id].curr_req = workreq;
-                dev->last_cmd[c] = workreq->device->id;
+        if (dev->id[c][scmd_id(workreq)].curr_req == 0) {       
+                dev->id[c][scmd_id(workreq)].curr_req = workreq;
+                dev->last_cmd[c] = scmd_id(workreq);
                 goto cmd_subp;
         }       
         dev->quhd[c] = j;
@@ -786,16 +786,16 @@ abortsnd:
 oktosend:
 #ifdef ED_DBGP
         printk("OK to Send\n");
-        printk("CDB");
+        scmd_printk(KERN_DEBUG, workreq, "CDB");
         for(i=0;i<workreq->cmd_len;i++) {
                 printk(" %x",workreq->cmnd[i]);
         }
-        printk("\nChannel = %d ID = %d LUN = %d\n",c,workreq->device->id,workreq->device->lun);
+        printk("\n");
 #endif  
         if (dev->dev_id == ATP885_DEVID) {
                 j = inb(dev->baseport + 0x29) & 0xfe;
                 outb(j, dev->baseport + 0x29);
-                dev->r1f[c][workreq->device->id] = 0;
+                dev->r1f[c][scmd_id(workreq)] = 0;
         }
         
         if (workreq->cmnd[0] == READ_CAPACITY) {
@@ -809,7 +809,7 @@ oktosend:
 
         tmport = workport + 0x1b;
         j = 0;
-        target_id = workreq->device->id;
+        target_id = scmd_id(workreq);
 
         /*
          *      Wide ?
@@ -3108,7 +3108,7 @@ static int atp870u_abort(struct scsi_cmnd * SCpnt)
         host = SCpnt->device->host;
 
         dev = (struct atp_unit *)&host->hostdata;
-        c=SCpnt->device->channel;
+        c = scmd_channel(SCpnt);
         printk(" atp870u: abort Channel = %x \n", c);
         printk("working=%x last_cmd=%x ", dev->working[c], dev->last_cmd[c]);
         printk(" quhdu=%x quendu=%x ", dev->quhd[c], dev->quend[c]);