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, 2 insertions, 2 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 31738627ec64..cad0d6db6df5 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -588,7 +588,7 @@ static void __ata_port_freeze(struct ata_port *ap)
 
         ap->pflags |= ATA_PFLAG_FROZEN;
 
-        DPRINTK("ata%u port frozen\n", ap->id);
+        DPRINTK("ata%u port frozen\n", ap->print_id);
 }
 
 /**
@@ -661,7 +661,7 @@ void ata_eh_thaw_port(struct ata_port *ap)
 
         spin_unlock_irqrestore(ap->lock, flags);
 
-        DPRINTK("ata%u port thawed\n", ap->id);
+        DPRINTK("ata%u port thawed\n", ap->print_id);
 }
 
 static void ata_eh_scsidone(struct scsi_cmnd *scmd)