diff options
Diffstat (limited to 'drivers/net/bmac.c')
-rw-r--r-- | drivers/net/bmac.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 4adfe7b77031..4528ce9c4e43 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -152,9 +152,9 @@ static void bmac_init_chip(struct net_device *dev); | |||
152 | static void bmac_init_registers(struct net_device *dev); | 152 | static void bmac_init_registers(struct net_device *dev); |
153 | static void bmac_enable_and_reset_chip(struct net_device *dev); | 153 | static void bmac_enable_and_reset_chip(struct net_device *dev); |
154 | static int bmac_set_address(struct net_device *dev, void *addr); | 154 | static int bmac_set_address(struct net_device *dev, void *addr); |
155 | static irqreturn_t bmac_misc_intr(int irq, void *dev_id, struct pt_regs *regs); | 155 | static irqreturn_t bmac_misc_intr(int irq, void *dev_id); |
156 | static irqreturn_t bmac_txdma_intr(int irq, void *dev_id, struct pt_regs *regs); | 156 | static irqreturn_t bmac_txdma_intr(int irq, void *dev_id); |
157 | static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs); | 157 | static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id); |
158 | static void bmac_set_timeout(struct net_device *dev); | 158 | static void bmac_set_timeout(struct net_device *dev); |
159 | static void bmac_tx_timeout(unsigned long data); | 159 | static void bmac_tx_timeout(unsigned long data); |
160 | static int bmac_output(struct sk_buff *skb, struct net_device *dev); | 160 | static int bmac_output(struct sk_buff *skb, struct net_device *dev); |
@@ -688,7 +688,7 @@ static int bmac_transmit_packet(struct sk_buff *skb, struct net_device *dev) | |||
688 | 688 | ||
689 | static int rxintcount; | 689 | static int rxintcount; |
690 | 690 | ||
691 | static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) | 691 | static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id) |
692 | { | 692 | { |
693 | struct net_device *dev = (struct net_device *) dev_id; | 693 | struct net_device *dev = (struct net_device *) dev_id; |
694 | struct bmac_data *bp = netdev_priv(dev); | 694 | struct bmac_data *bp = netdev_priv(dev); |
@@ -765,7 +765,7 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
765 | 765 | ||
766 | static int txintcount; | 766 | static int txintcount; |
767 | 767 | ||
768 | static irqreturn_t bmac_txdma_intr(int irq, void *dev_id, struct pt_regs *regs) | 768 | static irqreturn_t bmac_txdma_intr(int irq, void *dev_id) |
769 | { | 769 | { |
770 | struct net_device *dev = (struct net_device *) dev_id; | 770 | struct net_device *dev = (struct net_device *) dev_id; |
771 | struct bmac_data *bp = netdev_priv(dev); | 771 | struct bmac_data *bp = netdev_priv(dev); |
@@ -1082,7 +1082,7 @@ static void bmac_set_multicast(struct net_device *dev) | |||
1082 | 1082 | ||
1083 | static int miscintcount; | 1083 | static int miscintcount; |
1084 | 1084 | ||
1085 | static irqreturn_t bmac_misc_intr(int irq, void *dev_id, struct pt_regs *regs) | 1085 | static irqreturn_t bmac_misc_intr(int irq, void *dev_id) |
1086 | { | 1086 | { |
1087 | struct net_device *dev = (struct net_device *) dev_id; | 1087 | struct net_device *dev = (struct net_device *) dev_id; |
1088 | struct bmac_data *bp = netdev_priv(dev); | 1088 | struct bmac_data *bp = netdev_priv(dev); |
@@ -1091,7 +1091,7 @@ static irqreturn_t bmac_misc_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
1091 | XXDEBUG(("bmac_misc_intr\n")); | 1091 | XXDEBUG(("bmac_misc_intr\n")); |
1092 | } | 1092 | } |
1093 | /* XXDEBUG(("bmac_misc_intr, status=%#08x\n", status)); */ | 1093 | /* XXDEBUG(("bmac_misc_intr, status=%#08x\n", status)); */ |
1094 | /* bmac_txdma_intr_inner(irq, dev_id, regs); */ | 1094 | /* bmac_txdma_intr_inner(irq, dev_id); */ |
1095 | /* if (status & FrameReceived) bp->stats.rx_dropped++; */ | 1095 | /* if (status & FrameReceived) bp->stats.rx_dropped++; */ |
1096 | if (status & RxErrorMask) bp->stats.rx_errors++; | 1096 | if (status & RxErrorMask) bp->stats.rx_errors++; |
1097 | if (status & RxCRCCntExp) bp->stats.rx_crc_errors++; | 1097 | if (status & RxCRCCntExp) bp->stats.rx_crc_errors++; |