diff options
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 20 |
1 files changed, 8 insertions, 12 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, | |||
| 294 | return 0; | 294 | return 0; |
| 295 | 295 | ||
| 296 | if (ata_msg_probe(ap)) | 296 | if (ata_msg_probe(ap)) |
| 297 | ata_dev_printk(atadev, KERN_DEBUG, | 297 | ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n", |
| 298 | "%s: ENTER: ap->id: %d, port#: %d\n", | 298 | __FUNCTION__, ap->port_no); |
| 299 | __FUNCTION__, ap->id, ap->port_no); | ||
| 300 | 299 | ||
| 301 | if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED)) { | 300 | if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED)) { |
| 302 | if (ata_msg_probe(ap)) | 301 | if (ata_msg_probe(ap)) |
| @@ -521,9 +520,8 @@ static int do_drive_set_taskfiles(struct ata_port *ap, | |||
| 521 | struct taskfile_array *gtf; | 520 | struct taskfile_array *gtf; |
| 522 | 521 | ||
| 523 | if (ata_msg_probe(ap)) | 522 | if (ata_msg_probe(ap)) |
| 524 | ata_dev_printk(atadev, KERN_DEBUG, | 523 | ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n", |
| 525 | "%s: ENTER: ap->id: %d, port#: %d\n", | 524 | __FUNCTION__, ap->port_no); |
| 526 | __FUNCTION__, ap->id, ap->port_no); | ||
| 527 | 525 | ||
| 528 | if (noacpi || !(ap->cbl == ATA_CBL_SATA)) | 526 | if (noacpi || !(ap->cbl == ATA_CBL_SATA)) |
| 529 | return 0; | 527 | return 0; |
| @@ -627,9 +625,8 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix) | |||
| 627 | return 0; | 625 | return 0; |
| 628 | 626 | ||
| 629 | if (ata_msg_probe(ap)) | 627 | if (ata_msg_probe(ap)) |
| 630 | ata_dev_printk(atadev, KERN_DEBUG, | 628 | ata_dev_printk(atadev, KERN_DEBUG, "%s: ix = %d, port#: %d\n", |
| 631 | "%s: ap->id: %d, ix = %d, port#: %d\n", | 629 | __FUNCTION__, ix, ap->port_no); |
| 632 | __FUNCTION__, ap->id, ix, ap->port_no); | ||
| 633 | 630 | ||
| 634 | /* Don't continue if not a SATA device. */ | 631 | /* Don't continue if not a SATA device. */ |
| 635 | if (!(ap->cbl == ATA_CBL_SATA)) { | 632 | if (!(ap->cbl == ATA_CBL_SATA)) { |
| @@ -685,9 +682,8 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix) | |||
| 685 | if (err < 0) { | 682 | if (err < 0) { |
| 686 | if (ata_msg_probe(ap)) | 683 | if (ata_msg_probe(ap)) |
| 687 | ata_dev_printk(atadev, KERN_DEBUG, | 684 | ata_dev_printk(atadev, KERN_DEBUG, |
| 688 | "ata%u(%u): %s _SDD error: status = 0x%x\n", | 685 | "%s _SDD error: status = 0x%x\n", |
| 689 | ap->id, ap->device->devno, | 686 | __FUNCTION__, status); |
| 690 | __FUNCTION__, status); | ||
| 691 | } | 687 | } |
| 692 | 688 | ||
| 693 | /* always return success */ | 689 | /* always return success */ |