diff options
author | James Bottomley <James.Bottomley@suse.de> | 2011-04-24 15:31:33 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-14 14:59:54 -0400 |
commit | af649a1b56032a84b75825a94204a8f8f0120698 (patch) | |
tree | 9bf80890456674742cb0c66048bdf2b94eb55002 /drivers/ata/libata-sff.c | |
parent | 9281b16caac1276817b77033c5b8a1f5ca30102c (diff) |
libata-sff: prevent irq descriptions for dummy ports
This is a cosmetic change to prevent libata-sff adding irq
descriptions to dummy ports, since the information, while largely
unused, is erroneous.
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r-- | drivers/ata/libata-sff.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f8380ce0f4d1..b1b926c55a72 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -2447,13 +2447,18 @@ int ata_pci_sff_activate_host(struct ata_host *host, | |||
2447 | return -ENOMEM; | 2447 | return -ENOMEM; |
2448 | 2448 | ||
2449 | if (!legacy_mode && pdev->irq) { | 2449 | if (!legacy_mode && pdev->irq) { |
2450 | int i; | ||
2451 | |||
2450 | rc = devm_request_irq(dev, pdev->irq, irq_handler, | 2452 | rc = devm_request_irq(dev, pdev->irq, irq_handler, |
2451 | IRQF_SHARED, drv_name, host); | 2453 | IRQF_SHARED, drv_name, host); |
2452 | if (rc) | 2454 | if (rc) |
2453 | goto out; | 2455 | goto out; |
2454 | 2456 | ||
2455 | ata_port_desc(host->ports[0], "irq %d", pdev->irq); | 2457 | for (i = 0; i < 2; i++) { |
2456 | ata_port_desc(host->ports[1], "irq %d", pdev->irq); | 2458 | if (ata_port_is_dummy(host->ports[i])) |
2459 | continue; | ||
2460 | ata_port_desc(host->ports[i], "irq %d", pdev->irq); | ||
2461 | } | ||
2457 | } else if (legacy_mode) { | 2462 | } else if (legacy_mode) { |
2458 | if (!ata_port_is_dummy(host->ports[0])) { | 2463 | if (!ata_port_is_dummy(host->ports[0])) { |
2459 | rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev), | 2464 | rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev), |