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_promise.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_promise.c')
-rw-r--r-- | drivers/ata/sata_promise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 15c9437710fc..d636ede064aa 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -93,7 +93,7 @@ struct pdc_host_priv { | |||
93 | static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg); | 93 | static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg); |
94 | static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); | 94 | static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); |
95 | static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); | 95 | static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); |
96 | static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *regs); | 96 | static irqreturn_t pdc_interrupt (int irq, void *dev_instance); |
97 | static void pdc_eng_timeout(struct ata_port *ap); | 97 | static void pdc_eng_timeout(struct ata_port *ap); |
98 | static int pdc_port_start(struct ata_port *ap); | 98 | static int pdc_port_start(struct ata_port *ap); |
99 | static void pdc_port_stop(struct ata_port *ap); | 99 | static void pdc_port_stop(struct ata_port *ap); |
@@ -498,7 +498,7 @@ static void pdc_irq_clear(struct ata_port *ap) | |||
498 | readl(mmio + PDC_INT_SEQMASK); | 498 | readl(mmio + PDC_INT_SEQMASK); |
499 | } | 499 | } |
500 | 500 | ||
501 | static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *regs) | 501 | static irqreturn_t pdc_interrupt (int irq, void *dev_instance) |
502 | { | 502 | { |
503 | struct ata_host *host = dev_instance; | 503 | struct ata_host *host = dev_instance; |
504 | struct ata_port *ap; | 504 | struct ata_port *ap; |