diff options
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index df42e28cc80f..80bdcf846234 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -717,8 +717,8 @@ static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev); | |||
717 | static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); | 717 | static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); |
718 | static int vortex_rx(struct net_device *dev); | 718 | static int vortex_rx(struct net_device *dev); |
719 | static int boomerang_rx(struct net_device *dev); | 719 | static int boomerang_rx(struct net_device *dev); |
720 | static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 720 | static irqreturn_t vortex_interrupt(int irq, void *dev_id); |
721 | static irqreturn_t boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 721 | static irqreturn_t boomerang_interrupt(int irq, void *dev_id); |
722 | static int vortex_close(struct net_device *dev); | 722 | static int vortex_close(struct net_device *dev); |
723 | static void dump_tx_ring(struct net_device *dev); | 723 | static void dump_tx_ring(struct net_device *dev); |
724 | static void update_stats(void __iomem *ioaddr, struct net_device *dev); | 724 | static void update_stats(void __iomem *ioaddr, struct net_device *dev); |
@@ -794,7 +794,7 @@ static void poll_vortex(struct net_device *dev) | |||
794 | unsigned long flags; | 794 | unsigned long flags; |
795 | local_save_flags(flags); | 795 | local_save_flags(flags); |
796 | local_irq_disable(); | 796 | local_irq_disable(); |
797 | (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev,NULL); | 797 | (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev); |
798 | local_irq_restore(flags); | 798 | local_irq_restore(flags); |
799 | } | 799 | } |
800 | #endif | 800 | #endif |
@@ -1849,9 +1849,9 @@ static void vortex_tx_timeout(struct net_device *dev) | |||
1849 | unsigned long flags; | 1849 | unsigned long flags; |
1850 | local_irq_save(flags); | 1850 | local_irq_save(flags); |
1851 | if (vp->full_bus_master_tx) | 1851 | if (vp->full_bus_master_tx) |
1852 | boomerang_interrupt(dev->irq, dev, NULL); | 1852 | boomerang_interrupt(dev->irq, dev); |
1853 | else | 1853 | else |
1854 | vortex_interrupt(dev->irq, dev, NULL); | 1854 | vortex_interrupt(dev->irq, dev); |
1855 | local_irq_restore(flags); | 1855 | local_irq_restore(flags); |
1856 | } | 1856 | } |
1857 | } | 1857 | } |
@@ -2149,7 +2149,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2149 | */ | 2149 | */ |
2150 | 2150 | ||
2151 | static irqreturn_t | 2151 | static irqreturn_t |
2152 | vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2152 | vortex_interrupt(int irq, void *dev_id) |
2153 | { | 2153 | { |
2154 | struct net_device *dev = dev_id; | 2154 | struct net_device *dev = dev_id; |
2155 | struct vortex_private *vp = netdev_priv(dev); | 2155 | struct vortex_private *vp = netdev_priv(dev); |
@@ -2254,7 +2254,7 @@ handler_exit: | |||
2254 | */ | 2254 | */ |
2255 | 2255 | ||
2256 | static irqreturn_t | 2256 | static irqreturn_t |
2257 | boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2257 | boomerang_interrupt(int irq, void *dev_id) |
2258 | { | 2258 | { |
2259 | struct net_device *dev = dev_id; | 2259 | struct net_device *dev = dev_id; |
2260 | struct vortex_private *vp = netdev_priv(dev); | 2260 | struct vortex_private *vp = netdev_priv(dev); |