diff options
Diffstat (limited to 'drivers/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index d7b241f7d7bc..ffa0afd2eddc 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -623,7 +623,7 @@ static void free_ring(struct net_device *dev); | |||
623 | static void reinit_ring(struct net_device *dev); | 623 | static void reinit_ring(struct net_device *dev); |
624 | static void init_registers(struct net_device *dev); | 624 | static void init_registers(struct net_device *dev); |
625 | static int start_tx(struct sk_buff *skb, struct net_device *dev); | 625 | static int start_tx(struct sk_buff *skb, struct net_device *dev); |
626 | static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *regs); | 626 | static irqreturn_t intr_handler(int irq, void *dev_instance); |
627 | static void netdev_error(struct net_device *dev, int intr_status); | 627 | static void netdev_error(struct net_device *dev, int intr_status); |
628 | static int natsemi_poll(struct net_device *dev, int *budget); | 628 | static int natsemi_poll(struct net_device *dev, int *budget); |
629 | static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do); | 629 | static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do); |
@@ -2088,7 +2088,7 @@ static void netdev_tx_done(struct net_device *dev) | |||
2088 | 2088 | ||
2089 | /* The interrupt handler doesn't actually handle interrupts itself, it | 2089 | /* The interrupt handler doesn't actually handle interrupts itself, it |
2090 | * schedules a NAPI poll if there is anything to do. */ | 2090 | * schedules a NAPI poll if there is anything to do. */ |
2091 | static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) | 2091 | static irqreturn_t intr_handler(int irq, void *dev_instance) |
2092 | { | 2092 | { |
2093 | struct net_device *dev = dev_instance; | 2093 | struct net_device *dev = dev_instance; |
2094 | struct netdev_private *np = netdev_priv(dev); | 2094 | struct netdev_private *np = netdev_priv(dev); |
@@ -2373,7 +2373,7 @@ static struct net_device_stats *get_stats(struct net_device *dev) | |||
2373 | static void natsemi_poll_controller(struct net_device *dev) | 2373 | static void natsemi_poll_controller(struct net_device *dev) |
2374 | { | 2374 | { |
2375 | disable_irq(dev->irq); | 2375 | disable_irq(dev->irq); |
2376 | intr_handler(dev->irq, dev, NULL); | 2376 | intr_handler(dev->irq, dev); |
2377 | enable_irq(dev->irq); | 2377 | enable_irq(dev->irq); |
2378 | } | 2378 | } |
2379 | #endif | 2379 | #endif |