diff options
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index d09d20a17790..323b60710806 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -82,12 +82,9 @@ enum { | |||
82 | 82 | ||
83 | static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); | 83 | static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); |
84 | static void nv_ck804_host_stop(struct ata_host *host); | 84 | static void nv_ck804_host_stop(struct ata_host *host); |
85 | static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance, | 85 | static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance); |
86 | struct pt_regs *regs); | 86 | static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance); |
87 | static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, | 87 | static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance); |
88 | struct pt_regs *regs); | ||
89 | static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance, | ||
90 | struct pt_regs *regs); | ||
91 | static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg); | 88 | static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg); |
92 | static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); | 89 | static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); |
93 | 90 | ||
@@ -276,8 +273,7 @@ MODULE_LICENSE("GPL"); | |||
276 | MODULE_DEVICE_TABLE(pci, nv_pci_tbl); | 273 | MODULE_DEVICE_TABLE(pci, nv_pci_tbl); |
277 | MODULE_VERSION(DRV_VERSION); | 274 | MODULE_VERSION(DRV_VERSION); |
278 | 275 | ||
279 | static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance, | 276 | static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance) |
280 | struct pt_regs *regs) | ||
281 | { | 277 | { |
282 | struct ata_host *host = dev_instance; | 278 | struct ata_host *host = dev_instance; |
283 | unsigned int i; | 279 | unsigned int i; |
@@ -357,8 +353,7 @@ static irqreturn_t nv_do_interrupt(struct ata_host *host, u8 irq_stat) | |||
357 | return IRQ_RETVAL(handled); | 353 | return IRQ_RETVAL(handled); |
358 | } | 354 | } |
359 | 355 | ||
360 | static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, | 356 | static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance) |
361 | struct pt_regs *regs) | ||
362 | { | 357 | { |
363 | struct ata_host *host = dev_instance; | 358 | struct ata_host *host = dev_instance; |
364 | u8 irq_stat; | 359 | u8 irq_stat; |
@@ -372,8 +367,7 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, | |||
372 | return ret; | 367 | return ret; |
373 | } | 368 | } |
374 | 369 | ||
375 | static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance, | 370 | static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance) |
376 | struct pt_regs *regs) | ||
377 | { | 371 | { |
378 | struct ata_host *host = dev_instance; | 372 | struct ata_host *host = dev_instance; |
379 | u8 irq_stat; | 373 | u8 irq_stat; |