diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/ata/sata_sil24.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/ata/sata_sil24.c')
-rw-r--r-- | drivers/ata/sata_sil24.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index a951f40c2f21..169e200a6a71 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -330,7 +330,7 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf); | |||
330 | static void sil24_qc_prep(struct ata_queued_cmd *qc); | 330 | static void sil24_qc_prep(struct ata_queued_cmd *qc); |
331 | static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc); | 331 | static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc); |
332 | static void sil24_irq_clear(struct ata_port *ap); | 332 | static void sil24_irq_clear(struct ata_port *ap); |
333 | static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs); | 333 | static irqreturn_t sil24_interrupt(int irq, void *dev_instance); |
334 | static void sil24_freeze(struct ata_port *ap); | 334 | static void sil24_freeze(struct ata_port *ap); |
335 | static void sil24_thaw(struct ata_port *ap); | 335 | static void sil24_thaw(struct ata_port *ap); |
336 | static void sil24_error_handler(struct ata_port *ap); | 336 | static void sil24_error_handler(struct ata_port *ap); |
@@ -870,7 +870,7 @@ static inline void sil24_host_intr(struct ata_port *ap) | |||
870 | slot_stat, ap->active_tag, ap->sactive); | 870 | slot_stat, ap->active_tag, ap->sactive); |
871 | } | 871 | } |
872 | 872 | ||
873 | static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs) | 873 | static irqreturn_t sil24_interrupt(int irq, void *dev_instance) |
874 | { | 874 | { |
875 | struct ata_host *host = dev_instance; | 875 | struct ata_host *host = dev_instance; |
876 | struct sil24_host_priv *hpriv = host->private_data; | 876 | struct sil24_host_priv *hpriv = host->private_data; |