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

diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 6ceabbd42a3d..26146a4b67b8 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -936,7 +936,7 @@ static void esp_release_dmabufs(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 
 static void esp_restore_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 {
-        struct esp_pointers *ep = &esp->data_pointers[sp->device->id];
+        struct esp_pointers *ep = &esp->data_pointers[scmd_id(sp)];
 
         sp->SCp.ptr = ep->saved_ptr;
         sp->SCp.buffer = ep->saved_buffer;
@@ -946,7 +946,7 @@ static void esp_restore_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 
 static void esp_save_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 {
-        struct esp_pointers *ep = &esp->data_pointers[sp->device->id];
+        struct esp_pointers *ep = &esp->data_pointers[scmd_id(sp)];
 
         ep->saved_ptr = sp->SCp.ptr;
         ep->saved_buffer = sp->SCp.buffer;
@@ -1693,13 +1693,13 @@ static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
         if(esp->prev_soff  != esp_dev->sync_max_offset ||
            esp->prev_stp   != esp_dev->sync_min_period ||
            (esp->erev > esp100a &&
-            esp->prev_cfg3 != esp->config3[sp->device->id])) {
+            esp->prev_cfg3 != esp->config3[scmd_id(sp)])) {
                 esp->prev_soff = esp_dev->sync_max_offset;
                 esp_write(eregs->esp_soff, esp->prev_soff);
                 esp->prev_stp = esp_dev->sync_min_period;
                 esp_write(eregs->esp_stp, esp->prev_stp);
                 if(esp->erev > esp100a) {
-                        esp->prev_cfg3 = esp->config3[sp->device->id];
+                        esp->prev_cfg3 = esp->config3[scmd_id(sp)];
                         esp_write(eregs->esp_cfg3, esp->prev_cfg3);
                 } 
         }
@@ -2205,7 +2205,7 @@ static int esp_do_freebus(struct NCR_ESP *esp, struct ESP_regs *eregs)
 
                 if(SCptr->SCp.Status != GOOD &&
                    SCptr->SCp.Status != CONDITION_GOOD &&
-                   ((1<<SCptr->device->id) & esp->targets_present) &&
+                   ((1<<scmd_id(SCptr)) & esp->targets_present) &&
                    esp_dev->sync && esp_dev->sync_max_offset) {
                         /* SCSI standard says that the synchronous capabilities
                          * should be renegotiated at this point.  Most likely
@@ -2597,7 +2597,7 @@ static int esp_select_complete(struct NCR_ESP *esp, struct ESP_regs *eregs)
          */
         if(esp->ireg == (ESP_INTR_FDONE | ESP_INTR_BSERV)) {
                 /* target speaks... */
-                esp->targets_present |= (1<<SCptr->device->id);
+                esp->targets_present |= (1<<scmd_id(SCptr));
 
                 /* What if the target ignores the sdtr? */
                 if(esp->snip)
@@ -3064,7 +3064,7 @@ static int check_multibyte_msg(struct NCR_ESP *esp,
                         ESPSDTR(("soff=%2x stp=%2x cfg3=%2x\n",
                                 esp_dev->sync_max_offset,
                                 esp_dev->sync_min_period,
-                                esp->config3[SCptr->device->id]));
+                                esp->config3[scmd_id(SCptr)]));
 
                         esp->snip = 0;
                 } else if(esp_dev->sync_max_offset) {
@@ -3621,7 +3621,7 @@ void esp_slave_destroy(Scsi_Device *SDptr)
 {
         struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;
 
-        esp->targets_present &= ~(1 << SDptr->id);
+        esp->targets_present &= ~(1 << sdev_id(SDptr));
         kfree(SDptr->hostdata);
         SDptr->hostdata = NULL;
 }