diff options
author | Tejun Heo <htejun@gmail.com> | 2007-02-21 02:36:33 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-23 05:37:11 -0500 |
commit | 878d4fedab4e5eba59877b771622856495a92df4 (patch) | |
tree | 51d17e7d2e81b3a979823009f390c7bfcfcd3801 /drivers/ata/pata_scc.c | |
parent | a2bbd0c923708a23c6fcc6bbc492f2eecadc676f (diff) |
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>
Diffstat (limited to 'drivers/ata/pata_scc.c')
-rw-r--r-- | drivers/ata/pata_scc.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
366 | static void scc_exec_command (struct ata_port *ap, | 366 | static void scc_exec_command (struct ata_port *ap, |
367 | const struct ata_taskfile *tf) | 367 | const struct ata_taskfile *tf) |
368 | { | 368 | { |
369 | DPRINTK("ata%u: cmd 0x%X\n", ap->id, tf->command); | 369 | DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command); |
370 | 370 | ||
371 | out_be32(ap->ioaddr.command_addr, tf->command); | 371 | out_be32(ap->ioaddr.command_addr, tf->command); |
372 | ata_pause(ap); | 372 | ata_pause(ap); |
@@ -542,7 +542,7 @@ static unsigned int scc_bus_softreset (struct ata_port *ap, | |||
542 | { | 542 | { |
543 | struct ata_ioports *ioaddr = &ap->ioaddr; | 543 | struct ata_ioports *ioaddr = &ap->ioaddr; |
544 | 544 | ||
545 | DPRINTK("ata%u: bus reset via SRST\n", ap->id); | 545 | DPRINTK("ata%u: bus reset via SRST\n", ap->print_id); |
546 | 546 | ||
547 | /* software reset. causes dev0 to be selected */ | 547 | /* software reset. causes dev0 to be selected */ |
548 | out_be32(ioaddr->ctl_addr, ap->ctl); | 548 | out_be32(ioaddr->ctl_addr, ap->ctl); |