diff options
Diffstat (limited to 'drivers/char/ip2')
-rw-r--r-- | drivers/char/ip2/ip2main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 62ef511d143b..858ba5432c99 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -190,7 +190,7 @@ static int ip2_tiocmset(struct tty_struct *tty, struct file *file, | |||
190 | 190 | ||
191 | static void set_irq(int, int); | 191 | static void set_irq(int, int); |
192 | static void ip2_interrupt_bh(i2eBordStrPtr pB); | 192 | static void ip2_interrupt_bh(i2eBordStrPtr pB); |
193 | static irqreturn_t ip2_interrupt(int irq, void *dev_id, struct pt_regs * regs); | 193 | static irqreturn_t ip2_interrupt(int irq, void *dev_id); |
194 | static void ip2_poll(unsigned long arg); | 194 | static void ip2_poll(unsigned long arg); |
195 | static inline void service_all_boards(void); | 195 | static inline void service_all_boards(void); |
196 | static void do_input(void *p); | 196 | static void do_input(void *p); |
@@ -1154,10 +1154,9 @@ ip2_interrupt_bh(i2eBordStrPtr pB) | |||
1154 | 1154 | ||
1155 | 1155 | ||
1156 | /******************************************************************************/ | 1156 | /******************************************************************************/ |
1157 | /* Function: ip2_interrupt(int irq, void *dev_id, struct pt_regs * regs) */ | 1157 | /* Function: ip2_interrupt(int irq, void *dev_id) */ |
1158 | /* Parameters: irq - interrupt number */ | 1158 | /* Parameters: irq - interrupt number */ |
1159 | /* pointer to optional device ID structure */ | 1159 | /* pointer to optional device ID structure */ |
1160 | /* pointer to register structure */ | ||
1161 | /* Returns: Nothing */ | 1160 | /* Returns: Nothing */ |
1162 | /* */ | 1161 | /* */ |
1163 | /* Description: */ | 1162 | /* Description: */ |
@@ -1173,7 +1172,7 @@ ip2_interrupt_bh(i2eBordStrPtr pB) | |||
1173 | /* */ | 1172 | /* */ |
1174 | /******************************************************************************/ | 1173 | /******************************************************************************/ |
1175 | static irqreturn_t | 1174 | static irqreturn_t |
1176 | ip2_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 1175 | ip2_interrupt(int irq, void *dev_id) |
1177 | { | 1176 | { |
1178 | int i; | 1177 | int i; |
1179 | i2eBordStrPtr pB; | 1178 | i2eBordStrPtr pB; |
@@ -1237,7 +1236,7 @@ ip2_poll(unsigned long arg) | |||
1237 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. | 1236 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. |
1238 | // It will NOT poll boards handled by hard interrupts. | 1237 | // It will NOT poll boards handled by hard interrupts. |
1239 | // The issue of queued BH interrups is handled in ip2_interrupt(). | 1238 | // The issue of queued BH interrups is handled in ip2_interrupt(). |
1240 | ip2_interrupt(0, NULL, NULL); | 1239 | ip2_interrupt(0, NULL); |
1241 | 1240 | ||
1242 | PollTimer.expires = POLL_TIMEOUT; | 1241 | PollTimer.expires = POLL_TIMEOUT; |
1243 | add_timer( &PollTimer ); | 1242 | add_timer( &PollTimer ); |