diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-08-15 05:38:46 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:34 -0400 |
commit | 6d32d30f55020d766388df7515f771f68c973033 (patch) | |
tree | ec0efe48460b5b3f177fed2698ccd04b7964359b /drivers/ata/libata-core.c | |
parent | cb94c1cf5a6beffbd8935eb91227df0dd1987644 (diff) |
[libata] Remove ->irq_ack() hook, and ata_dummy_irq_on()
* ->irq_ack() is redundant to what the irq handler already
performs... chk-status + irq-clear. Furthermore, it is only
called in one place, when screaming-irq-debugging is enabled,
so we don't want to bother with a hook just for that.
* ata_dummy_irq_on() is only ever used in drivers that have
no callpath reaching ->irq_on(). Remove .irq_on hook from
those drivers, and the now-unused ata_dummy_irq_on()
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 9f87f7ddd485..4f8b8d210cf4 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -5747,7 +5747,8 @@ idle_irq: | |||
5747 | 5747 | ||
5748 | #ifdef ATA_IRQ_TRAP | 5748 | #ifdef ATA_IRQ_TRAP |
5749 | if ((ap->stats.idle_irq % 1000) == 0) { | 5749 | if ((ap->stats.idle_irq % 1000) == 0) { |
5750 | ap->ops->irq_ack(ap, 0); /* debug trap */ | 5750 | ata_chk_status(ap); |
5751 | ap->ops->irq_clear(ap); | ||
5751 | ata_port_printk(ap, KERN_WARNING, "irq trap\n"); | 5752 | ata_port_printk(ap, KERN_WARNING, "irq trap\n"); |
5752 | return 1; | 5753 | return 1; |
5753 | } | 5754 | } |
@@ -7137,9 +7138,6 @@ EXPORT_SYMBOL_GPL(ata_eh_qc_complete); | |||
7137 | EXPORT_SYMBOL_GPL(ata_eh_qc_retry); | 7138 | EXPORT_SYMBOL_GPL(ata_eh_qc_retry); |
7138 | EXPORT_SYMBOL_GPL(ata_do_eh); | 7139 | EXPORT_SYMBOL_GPL(ata_do_eh); |
7139 | EXPORT_SYMBOL_GPL(ata_irq_on); | 7140 | EXPORT_SYMBOL_GPL(ata_irq_on); |
7140 | EXPORT_SYMBOL_GPL(ata_dummy_irq_on); | ||
7141 | EXPORT_SYMBOL_GPL(ata_irq_ack); | ||
7142 | EXPORT_SYMBOL_GPL(ata_dummy_irq_ack); | ||
7143 | EXPORT_SYMBOL_GPL(ata_dev_try_classify); | 7141 | EXPORT_SYMBOL_GPL(ata_dev_try_classify); |
7144 | 7142 | ||
7145 | EXPORT_SYMBOL_GPL(ata_cable_40wire); | 7143 | EXPORT_SYMBOL_GPL(ata_cable_40wire); |