diff options
Diffstat (limited to 'drivers/pcmcia/i82365.c')
-rw-r--r-- | drivers/pcmcia/i82365.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index 1cc2682394b1..ea74f98a7350 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c | |||
@@ -80,7 +80,7 @@ module_param(pc_debug, int, 0644); | |||
80 | #define debug(lvl, fmt, arg...) do { } while (0) | 80 | #define debug(lvl, fmt, arg...) do { } while (0) |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | static irqreturn_t i365_count_irq(int, void *, struct pt_regs *); | 83 | static irqreturn_t i365_count_irq(int, void *); |
84 | static inline int _check_irq(int irq, int flags) | 84 | static inline int _check_irq(int irq, int flags) |
85 | { | 85 | { |
86 | if (request_irq(irq, i365_count_irq, flags, "x", i365_count_irq) != 0) | 86 | if (request_irq(irq, i365_count_irq, flags, "x", i365_count_irq) != 0) |
@@ -498,7 +498,7 @@ static u_int __init set_bridge_opts(u_short s, u_short ns) | |||
498 | static volatile u_int irq_hits; | 498 | static volatile u_int irq_hits; |
499 | static u_short irq_sock; | 499 | static u_short irq_sock; |
500 | 500 | ||
501 | static irqreturn_t i365_count_irq(int irq, void *dev, struct pt_regs *regs) | 501 | static irqreturn_t i365_count_irq(int irq, void *dev) |
502 | { | 502 | { |
503 | i365_get(irq_sock, I365_CSC); | 503 | i365_get(irq_sock, I365_CSC); |
504 | irq_hits++; | 504 | irq_hits++; |
@@ -848,8 +848,7 @@ static void __init isa_probe(void) | |||
848 | 848 | ||
849 | /*====================================================================*/ | 849 | /*====================================================================*/ |
850 | 850 | ||
851 | static irqreturn_t pcic_interrupt(int irq, void *dev, | 851 | static irqreturn_t pcic_interrupt(int irq, void *dev) |
852 | struct pt_regs *regs) | ||
853 | { | 852 | { |
854 | int i, j, csc; | 853 | int i, j, csc; |
855 | u_int events, active; | 854 | u_int events, active; |
@@ -898,7 +897,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev, | |||
898 | 897 | ||
899 | static void pcic_interrupt_wrapper(u_long data) | 898 | static void pcic_interrupt_wrapper(u_long data) |
900 | { | 899 | { |
901 | pcic_interrupt(0, NULL, NULL); | 900 | pcic_interrupt(0, NULL); |
902 | poll_timer.expires = jiffies + poll_interval; | 901 | poll_timer.expires = jiffies + poll_interval; |
903 | add_timer(&poll_timer); | 902 | add_timer(&poll_timer); |
904 | } | 903 | } |