diff options
Diffstat (limited to 'drivers/cdrom')
-rw-r--r-- | drivers/cdrom/cdu31a.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/cm206.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/mcdx.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/sonycd535.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index ccd91c1a84bd..2157c58755e0 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c | |||
@@ -513,7 +513,7 @@ static inline void write_cmd(unsigned char cmd) | |||
513 | outb(cmd, sony_cd_cmd_reg); | 513 | outb(cmd, sony_cd_cmd_reg); |
514 | } | 514 | } |
515 | 515 | ||
516 | static irqreturn_t cdu31a_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 516 | static irqreturn_t cdu31a_interrupt(int irq, void *dev_id) |
517 | { | 517 | { |
518 | unsigned char val; | 518 | unsigned char val; |
519 | 519 | ||
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index 9b05ddd23141..e6d8e9ededea 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
@@ -359,7 +359,7 @@ static struct tasklet_struct cm206_tasklet; | |||
359 | as there seems so reason for this to happen. | 359 | as there seems so reason for this to happen. |
360 | */ | 360 | */ |
361 | 361 | ||
362 | static irqreturn_t cm206_interrupt(int sig, void *dev_id, struct pt_regs *regs) | 362 | static irqreturn_t cm206_interrupt(int sig, void *dev_id) |
363 | { | 363 | { |
364 | volatile ush fool; | 364 | volatile ush fool; |
365 | cd->intr_ds = inw(r_data_status); /* resets data_ready, data_error, | 365 | cd->intr_ds = inw(r_data_status); /* resets data_ready, data_error, |
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index dcd1ab684f3e..60e1978ec0ea 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c | |||
@@ -845,7 +845,7 @@ static void mcdx_delay(struct s_drive_stuff *stuff, long jifs) | |||
845 | } | 845 | } |
846 | } | 846 | } |
847 | 847 | ||
848 | static irqreturn_t mcdx_intr(int irq, void *dev_id, struct pt_regs *regs) | 848 | static irqreturn_t mcdx_intr(int irq, void *dev_id) |
849 | { | 849 | { |
850 | struct s_drive_stuff *stuffp = dev_id; | 850 | struct s_drive_stuff *stuffp = dev_id; |
851 | unsigned char b; | 851 | unsigned char b; |
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index 30ab56258a92..f77ada933ea0 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c | |||
@@ -322,7 +322,7 @@ disable_interrupts(void) | |||
322 | } | 322 | } |
323 | 323 | ||
324 | static irqreturn_t | 324 | static irqreturn_t |
325 | cdu535_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 325 | cdu535_interrupt(int irq, void *dev_id) |
326 | { | 326 | { |
327 | disable_interrupts(); | 327 | disable_interrupts(); |
328 | if (waitqueue_active(&cdu535_irq_wait)) { | 328 | if (waitqueue_active(&cdu535_irq_wait)) { |