libata: fix remaining ap->id

Merge order left libata-acpi and pata_scc with remainling usage of
ap->id.  Kill superflous id printing and substitute the remaining ones
with ap->print_id.

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

2 files changed, 10 insertions, 14 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index b4e8be5d292c..1bdf7a2c2743 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -294,9 +294,8 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix,
                 return 0;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG,
-                        "%s: ENTER: ap->id: %d, port#: %d\n",
-                        __FUNCTION__, ap->id, ap->port_no);
+                ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
+                               __FUNCTION__, ap->port_no);
 
         if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED)) {
                 if (ata_msg_probe(ap))
@@ -521,9 +520,8 @@ static int do_drive_set_taskfiles(struct ata_port *ap,
         struct taskfile_array   *gtf;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG,
-                        "%s: ENTER: ap->id: %d, port#: %d\n",
-                        __FUNCTION__, ap->id, ap->port_no);
+                ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
+                               __FUNCTION__, ap->port_no);
 
         if (noacpi || !(ap->cbl == ATA_CBL_SATA))
                 return 0;
@@ -627,9 +625,8 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix)
                 return 0;
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(atadev, KERN_DEBUG,
-                        "%s: ap->id: %d, ix = %d, port#: %d\n",
-                        __FUNCTION__, ap->id, ix, ap->port_no);
+                ata_dev_printk(atadev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
+                               __FUNCTION__, ix, ap->port_no);
 
         /* Don't continue if not a SATA device. */
         if (!(ap->cbl == ATA_CBL_SATA)) {
@@ -685,9 +682,8 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix)
         if (err < 0) {
                 if (ata_msg_probe(ap))
                         ata_dev_printk(atadev, KERN_DEBUG,
-                                "ata%u(%u): %s _SDD error: status = 0x%x\n",
-                                ap->id, ap->device->devno,
-                                __FUNCTION__, status);
+                                       "%s _SDD error: status = 0x%x\n",
+                                       __FUNCTION__, status);
         }
 
         /* always return success */
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 049a3a284729..de04042f34d3 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -366,7 +366,7 @@ static void scc_tf_read (struct ata_port *ap, struct ata_taskfile *tf)
 static void scc_exec_command (struct ata_port *ap,
                               const struct ata_taskfile *tf)
 {
-        DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command);
+        DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
 
         out_be32(ap->ioaddr.command_addr, tf->command);
         ata_pause(ap);
@@ -542,7 +542,7 @@ static unsigned int scc_bus_softreset (struct ata_port *ap,
 {
         struct ata_ioports *ioaddr = &ap->ioaddr;
 
-        DPRINTK("ata%u: bus reset via SRST\n", ap->id);
+        DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
 
         /* software reset.  causes dev0 to be selected */
         out_be32(ioaddr->ctl_addr, ap->ctl);