summaryrefslogtreecommitdiff
path: root/drivers/ata/sata_qstor.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-02-21 01:06:51 +0900
committerJeff Garzik <jeff@garzik.org>2007-02-21 04:58:20 -0500
commit44877b4e22f391d39c6589412106a3668e81a05b (patch)
tree10bf134c2c8c15e3504d67461b42f53c6de88523 /drivers/ata/sata_qstor.c
parent5ce0cf6fafd02fb4c43fc1a1bee6069d6c0a36b1 (diff)
downloadlwn-44877b4e22f391d39c6589412106a3668e81a05b.tar.gz
lwn-44877b4e22f391d39c6589412106a3668e81a05b.zip
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>
Diffstat (limited to 'drivers/ata/sata_qstor.c')
-rw-r--r--drivers/ata/sata_qstor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 6097d8f2a0c0..1558571be0ee 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -446,7 +446,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
if ((status & ATA_BUSY))
continue;
DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
- ap->id, qc->tf.protocol, status);
+ ap->print_id, qc->tf.protocol, status);
/* complete taskfile transaction */
pp->state = qs_state_idle;