diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:10:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:10:06 -0500 |
| commit | 75deb6fa985bd3162b9472f1fc394e23294da816 (patch) | |
| tree | f959602fae8faba6b6cdc617069f3c02414e453b | |
| parent | 2061a47a9b9530a9523e51167c996307db951c31 (diff) | |
| parent | 6971ed1fbbc80cae54e082aae153d5b063885d0a (diff) | |
Merge branch 'upstream-fixes'
| -rw-r--r-- | drivers/scsi/ahci.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 1c2ab3dede7..00dfdefe296 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -778,23 +778,17 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * struct ata_queued_cmd *qc; qc = ata_qc_from_tag(ap, ap->active_tag); if (!ahci_host_intr(ap, qc)) - if (ata_ratelimit()) { - struct pci_dev *pdev = - to_pci_dev(ap->host_set->dev); - dev_printk(KERN_WARNING, &pdev->dev, + if (ata_ratelimit()) + dev_printk(KERN_WARNING, host_set->dev, "unhandled interrupt on port %u\n", i); - } VPRINTK("port %u\n", i); } else { VPRINTK("port %u (no irq)\n", i); - if (ata_ratelimit()) { - struct pci_dev *pdev = - to_pci_dev(ap->host_set->dev); - dev_printk(KERN_WARNING, &pdev->dev, + if (ata_ratelimit()) + dev_printk(KERN_WARNING, host_set->dev, "interrupt on disabled port %u\n", i); - } } irq_ack |= (1 << i); |