diff options
Diffstat (limited to 'drivers/net/wan/cycx_main.c')
-rw-r--r-- | drivers/net/wan/cycx_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c index a5e7ce1bd16a..6e5f1c898517 100644 --- a/drivers/net/wan/cycx_main.c +++ b/drivers/net/wan/cycx_main.c | |||
@@ -74,7 +74,7 @@ static int cycx_wan_setup(struct wan_device *wandev, wandev_conf_t *conf); | |||
74 | static int cycx_wan_shutdown(struct wan_device *wandev); | 74 | static int cycx_wan_shutdown(struct wan_device *wandev); |
75 | 75 | ||
76 | /* Miscellaneous functions */ | 76 | /* Miscellaneous functions */ |
77 | static irqreturn_t cycx_isr(int irq, void *dev_id, struct pt_regs *regs); | 77 | static irqreturn_t cycx_isr(int irq, void *dev_id); |
78 | 78 | ||
79 | /* Global Data | 79 | /* Global Data |
80 | * Note: All data must be explicitly initialized!!! | 80 | * Note: All data must be explicitly initialized!!! |
@@ -301,11 +301,11 @@ out: return ret; | |||
301 | * o acknowledge Cyclom 2X hardware interrupt. | 301 | * o acknowledge Cyclom 2X hardware interrupt. |
302 | * o call protocol-specific interrupt service routine, if any. | 302 | * o call protocol-specific interrupt service routine, if any. |
303 | */ | 303 | */ |
304 | static irqreturn_t cycx_isr(int irq, void *dev_id, struct pt_regs *regs) | 304 | static irqreturn_t cycx_isr(int irq, void *dev_id) |
305 | { | 305 | { |
306 | struct cycx_device *card = (struct cycx_device *)dev_id; | 306 | struct cycx_device *card = dev_id; |
307 | 307 | ||
308 | if (!card || card->wandev.state == WAN_UNCONFIGURED) | 308 | if (card->wandev.state == WAN_UNCONFIGURED) |
309 | goto out; | 309 | goto out; |
310 | 310 | ||
311 | if (card->in_isr) { | 311 | if (card->in_isr) { |