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

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 48e388800f5..00a9a6c8f83 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -782,7 +782,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
          */
         if (qc->err_mask ||
             tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
-                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
+                ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
                                    &sb[1], &sb[2], &sb[3], verbose);
                 sb[1] &= 0x0f;
         }
@@ -855,7 +855,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
          */
         if (qc->err_mask ||
             tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
-                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
+                ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
                                    &sb[1], &sb[2], &sb[3], verbose);
                 sb[1] &= 0x0f;
         }
@@ -1473,7 +1473,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
         }
 
         if (need_sense && !ap->ops->error_handler)
-                ata_dump_status(ap->id, &qc->result_tf);
+                ata_dump_status(ap->print_id, &qc->result_tf);
 
         qc->scsidone(cmd);
 
@@ -2776,7 +2776,7 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,
         u8 *scsicmd = cmd->cmnd;
 
         DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                ap->id,
+                ap->print_id,
                 scsidev->channel, scsidev->id, scsidev->lun,
                 scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
                 scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],