diff options
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 1344746381e8..26229d9da762 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -442,7 +442,7 @@ static int yenta_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map * | |||
442 | 442 | ||
443 | 443 | ||
444 | 444 | ||
445 | static irqreturn_t yenta_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 445 | static irqreturn_t yenta_interrupt(int irq, void *dev_id) |
446 | { | 446 | { |
447 | unsigned int events; | 447 | unsigned int events; |
448 | struct yenta_socket *socket = (struct yenta_socket *) dev_id; | 448 | struct yenta_socket *socket = (struct yenta_socket *) dev_id; |
@@ -478,7 +478,7 @@ static void yenta_interrupt_wrapper(unsigned long data) | |||
478 | { | 478 | { |
479 | struct yenta_socket *socket = (struct yenta_socket *) data; | 479 | struct yenta_socket *socket = (struct yenta_socket *) data; |
480 | 480 | ||
481 | yenta_interrupt(0, (void *)socket, NULL); | 481 | yenta_interrupt(0, (void *)socket); |
482 | socket->poll_timer.expires = jiffies + HZ; | 482 | socket->poll_timer.expires = jiffies + HZ; |
483 | add_timer(&socket->poll_timer); | 483 | add_timer(&socket->poll_timer); |
484 | } | 484 | } |
@@ -896,7 +896,7 @@ static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mas | |||
896 | #ifdef CONFIG_YENTA_TI | 896 | #ifdef CONFIG_YENTA_TI |
897 | 897 | ||
898 | /* interrupt handler, only used during probing */ | 898 | /* interrupt handler, only used during probing */ |
899 | static irqreturn_t yenta_probe_handler(int irq, void *dev_id, struct pt_regs *regs) | 899 | static irqreturn_t yenta_probe_handler(int irq, void *dev_id) |
900 | { | 900 | { |
901 | struct yenta_socket *socket = (struct yenta_socket *) dev_id; | 901 | struct yenta_socket *socket = (struct yenta_socket *) dev_id; |
902 | u8 csc; | 902 | u8 csc; |