libata: s/ap->id/ap->print_id/g

ata_port has two different id fields - id and port_no.  id is
system-wide 1-based unique id for the port while port_no is 0-based
host-wide port number.  The former is primarily used to identify the
ATA port to the user in printk messages while the latter is used in
various places in libata core and LLDs to index the port inside the
host.

The two fields feel quite similar and sometimes ap->id is used in
place of ap->port_no, which is very difficult to spot.  This patch
renames ap->id to ap->print_id to reduce the possibility of such bugs.

Some printk messages are adjusted such that id string (ata%u[.%u])
isn't printed twice and/or to use ata_*_printk() instead of hardcoded
id format.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 0ebd77b080d6..4fb8bfcefc0d 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -421,7 +421,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
 
         WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
 
-        VPRINTK("ata%u: ENTER\n", ap->id);
+        VPRINTK("ata%u: ENTER\n", ap->print_id);
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -478,7 +478,7 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)
         unsigned int portno = ap->port_no;
         unsigned int i;
 
-        VPRINTK("ata%u: ENTER\n", ap->id);
+        VPRINTK("ata%u: ENTER\n", ap->print_id);
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -605,7 +605,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
 
-        VPRINTK("ata%u: ENTER\n", ap->id);
+        VPRINTK("ata%u: ENTER\n", ap->print_id);
 
         wmb();                  /* flush PRD, pkt writes */
 
@@ -672,7 +672,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
 
                 /* step two - DMA from DIMM to host */
                 if (doing_hdma) {
-                        VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->id,
+                        VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->print_id,
                                 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
                         /* get drive status; clear intr; complete txn */
                         qc->err_mask |= ac_err_mask(ata_wait_idle(ap));
@@ -683,7 +683,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                 /* step one - exec ATA command */
                 else {
                         u8 seq = (u8) (port_no + 1 + 4);
-                        VPRINTK("ata%u: read ata, 0x%x 0x%x\n", ap->id,
+                        VPRINTK("ata%u: read ata, 0x%x 0x%x\n", ap->print_id,
                                 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
 
                         /* submit hdma pkt */
@@ -698,7 +698,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                 /* step one - DMA from host to DIMM */
                 if (doing_hdma) {
                         u8 seq = (u8) (port_no + 1);
-                        VPRINTK("ata%u: write hdma, 0x%x 0x%x\n", ap->id,
+                        VPRINTK("ata%u: write hdma, 0x%x 0x%x\n", ap->print_id,
                                 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
 
                         /* submit ata pkt */
@@ -711,7 +711,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
 
                 /* step two - execute ATA command */
                 else {
-                        VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->id,
+                        VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->print_id,
                                 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
                         /* get drive status; clear intr; complete txn */
                         qc->err_mask |= ac_err_mask(ata_wait_idle(ap));