diff options
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/aurora.c | 4 | ||||
| -rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 4 | ||||
| -rw-r--r-- | drivers/sbus/char/uctrl.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c index a305d4091547..a54b4ac67568 100644 --- a/drivers/sbus/char/aurora.c +++ b/drivers/sbus/char/aurora.c | |||
| @@ -254,7 +254,7 @@ for(i=0;i<TYPE_1_IRQS;i++) | |||
| 254 | return 0; | 254 | return 0; |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | static irqreturn_t aurora_interrupt(int irq, void * dev_id, struct pt_regs * regs); | 257 | static irqreturn_t aurora_interrupt(int irq, void * dev_id); |
| 258 | 258 | ||
| 259 | /* Main probing routine, also sets irq. */ | 259 | /* Main probing routine, also sets irq. */ |
| 260 | static int aurora_probe(void) | 260 | static int aurora_probe(void) |
| @@ -689,7 +689,7 @@ static void aurora_check_modem(struct Aurora_board const * bp, int chip) | |||
| 689 | } | 689 | } |
| 690 | 690 | ||
| 691 | /* The main interrupt processing routine */ | 691 | /* The main interrupt processing routine */ |
| 692 | static irqreturn_t aurora_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 692 | static irqreturn_t aurora_interrupt(int irq, void * dev_id) |
| 693 | { | 693 | { |
| 694 | unsigned char status; | 694 | unsigned char status; |
| 695 | unsigned char ack,chip/*,chip_id*/; | 695 | unsigned char ack,chip/*,chip_id*/; |
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 7186235594f9..22631f8b9b48 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c | |||
| @@ -331,7 +331,7 @@ EXPORT_SYMBOL(bbc_i2c_readb); | |||
| 331 | EXPORT_SYMBOL(bbc_i2c_write_buf); | 331 | EXPORT_SYMBOL(bbc_i2c_write_buf); |
| 332 | EXPORT_SYMBOL(bbc_i2c_read_buf); | 332 | EXPORT_SYMBOL(bbc_i2c_read_buf); |
| 333 | 333 | ||
| 334 | static irqreturn_t bbc_i2c_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 334 | static irqreturn_t bbc_i2c_interrupt(int irq, void *dev_id) |
| 335 | { | 335 | { |
| 336 | struct bbc_i2c_bus *bp = dev_id; | 336 | struct bbc_i2c_bus *bp = dev_id; |
| 337 | 337 | ||
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index 40b6fc86f6a8..f5803ecb1999 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c | |||
| @@ -185,7 +185,7 @@ MODULE_SUPPORTED_DEVICE | |||
| 185 | #ifdef WD_DEBUG | 185 | #ifdef WD_DEBUG |
| 186 | static void wd_dumpregs(void); | 186 | static void wd_dumpregs(void); |
| 187 | #endif | 187 | #endif |
| 188 | static irqreturn_t wd_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 188 | static irqreturn_t wd_interrupt(int irq, void *dev_id); |
| 189 | static void wd_toggleintr(struct wd_timer* pTimer, int enable); | 189 | static void wd_toggleintr(struct wd_timer* pTimer, int enable); |
| 190 | static void wd_pingtimer(struct wd_timer* pTimer); | 190 | static void wd_pingtimer(struct wd_timer* pTimer); |
| 191 | static void wd_starttimer(struct wd_timer* pTimer); | 191 | static void wd_starttimer(struct wd_timer* pTimer); |
| @@ -444,7 +444,7 @@ static ssize_t wd_read(struct file * file, char __user *buffer, | |||
| 444 | #endif /* ifdef WD_DEBUG */ | 444 | #endif /* ifdef WD_DEBUG */ |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | static irqreturn_t wd_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 447 | static irqreturn_t wd_interrupt(int irq, void *dev_id) |
| 448 | { | 448 | { |
| 449 | /* Only WD0 will interrupt-- others are NMI and we won't | 449 | /* Only WD0 will interrupt-- others are NMI and we won't |
| 450 | * see them here.... | 450 | * see them here.... |
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 575b1f7ed410..ddc0681ac759 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
| @@ -217,7 +217,7 @@ uctrl_open(struct inode *inode, struct file *file) | |||
| 217 | return 0; | 217 | return 0; |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | static irqreturn_t uctrl_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 220 | static irqreturn_t uctrl_interrupt(int irq, void *dev_id) |
| 221 | { | 221 | { |
| 222 | struct uctrl_driver *driver = (struct uctrl_driver *)dev_id; | 222 | struct uctrl_driver *driver = (struct uctrl_driver *)dev_id; |
| 223 | printk("in uctrl_interrupt\n"); | 223 | printk("in uctrl_interrupt\n"); |
