diff options
Diffstat (limited to 'drivers/net/mace.c')
-rw-r--r-- | drivers/net/mace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 27c24eaa2414..2907cfb12ada 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -82,9 +82,9 @@ static struct net_device_stats *mace_stats(struct net_device *dev); | |||
82 | static void mace_set_multicast(struct net_device *dev); | 82 | static void mace_set_multicast(struct net_device *dev); |
83 | static void mace_reset(struct net_device *dev); | 83 | static void mace_reset(struct net_device *dev); |
84 | static int mace_set_address(struct net_device *dev, void *addr); | 84 | static int mace_set_address(struct net_device *dev, void *addr); |
85 | static irqreturn_t mace_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 85 | static irqreturn_t mace_interrupt(int irq, void *dev_id); |
86 | static irqreturn_t mace_txdma_intr(int irq, void *dev_id, struct pt_regs *regs); | 86 | static irqreturn_t mace_txdma_intr(int irq, void *dev_id); |
87 | static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs); | 87 | static irqreturn_t mace_rxdma_intr(int irq, void *dev_id); |
88 | static void mace_set_timeout(struct net_device *dev); | 88 | static void mace_set_timeout(struct net_device *dev); |
89 | static void mace_tx_timeout(unsigned long data); | 89 | static void mace_tx_timeout(unsigned long data); |
90 | static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma); | 90 | static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma); |
@@ -678,7 +678,7 @@ static void mace_handle_misc_intrs(struct mace_data *mp, int intr) | |||
678 | printk(KERN_DEBUG "mace: jabbering transceiver\n"); | 678 | printk(KERN_DEBUG "mace: jabbering transceiver\n"); |
679 | } | 679 | } |
680 | 680 | ||
681 | static irqreturn_t mace_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 681 | static irqreturn_t mace_interrupt(int irq, void *dev_id) |
682 | { | 682 | { |
683 | struct net_device *dev = (struct net_device *) dev_id; | 683 | struct net_device *dev = (struct net_device *) dev_id; |
684 | struct mace_data *mp = (struct mace_data *) dev->priv; | 684 | struct mace_data *mp = (struct mace_data *) dev->priv; |
@@ -890,12 +890,12 @@ out: | |||
890 | spin_unlock_irqrestore(&mp->lock, flags); | 890 | spin_unlock_irqrestore(&mp->lock, flags); |
891 | } | 891 | } |
892 | 892 | ||
893 | static irqreturn_t mace_txdma_intr(int irq, void *dev_id, struct pt_regs *regs) | 893 | static irqreturn_t mace_txdma_intr(int irq, void *dev_id) |
894 | { | 894 | { |
895 | return IRQ_HANDLED; | 895 | return IRQ_HANDLED; |
896 | } | 896 | } |
897 | 897 | ||
898 | static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) | 898 | static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) |
899 | { | 899 | { |
900 | struct net_device *dev = (struct net_device *) dev_id; | 900 | struct net_device *dev = (struct net_device *) dev_id; |
901 | struct mace_data *mp = (struct mace_data *) dev->priv; | 901 | struct mace_data *mp = (struct mace_data *) dev->priv; |