diff options
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 280b114e253f..a06d8d1aaceb 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -119,9 +119,9 @@ struct sk_buff *gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp); | |||
119 | static struct net_device_stats *gfar_get_stats(struct net_device *dev); | 119 | static struct net_device_stats *gfar_get_stats(struct net_device *dev); |
120 | static int gfar_set_mac_address(struct net_device *dev); | 120 | static int gfar_set_mac_address(struct net_device *dev); |
121 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); | 121 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); |
122 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs); | 122 | static irqreturn_t gfar_error(int irq, void *dev_id); |
123 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs); | 123 | static irqreturn_t gfar_transmit(int irq, void *dev_id); |
124 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 124 | static irqreturn_t gfar_interrupt(int irq, void *dev_id); |
125 | static void adjust_link(struct net_device *dev); | 125 | static void adjust_link(struct net_device *dev); |
126 | static void init_registers(struct net_device *dev); | 126 | static void init_registers(struct net_device *dev); |
127 | static int init_phy(struct net_device *dev); | 127 | static int init_phy(struct net_device *dev); |
@@ -1173,7 +1173,7 @@ static void gfar_timeout(struct net_device *dev) | |||
1173 | } | 1173 | } |
1174 | 1174 | ||
1175 | /* Interrupt Handler for Transmit complete */ | 1175 | /* Interrupt Handler for Transmit complete */ |
1176 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs) | 1176 | static irqreturn_t gfar_transmit(int irq, void *dev_id) |
1177 | { | 1177 | { |
1178 | struct net_device *dev = (struct net_device *) dev_id; | 1178 | struct net_device *dev = (struct net_device *) dev_id; |
1179 | struct gfar_private *priv = netdev_priv(dev); | 1179 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1305,7 +1305,7 @@ static inline void count_errors(unsigned short status, struct gfar_private *priv | |||
1305 | } | 1305 | } |
1306 | } | 1306 | } |
1307 | 1307 | ||
1308 | irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | 1308 | irqreturn_t gfar_receive(int irq, void *dev_id) |
1309 | { | 1309 | { |
1310 | struct net_device *dev = (struct net_device *) dev_id; | 1310 | struct net_device *dev = (struct net_device *) dev_id; |
1311 | struct gfar_private *priv = netdev_priv(dev); | 1311 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1537,7 +1537,7 @@ static int gfar_poll(struct net_device *dev, int *budget) | |||
1537 | #endif | 1537 | #endif |
1538 | 1538 | ||
1539 | /* The interrupt handler for devices with one interrupt */ | 1539 | /* The interrupt handler for devices with one interrupt */ |
1540 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1540 | static irqreturn_t gfar_interrupt(int irq, void *dev_id) |
1541 | { | 1541 | { |
1542 | struct net_device *dev = dev_id; | 1542 | struct net_device *dev = dev_id; |
1543 | struct gfar_private *priv = netdev_priv(dev); | 1543 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1550,11 +1550,11 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1550 | 1550 | ||
1551 | /* Check for reception */ | 1551 | /* Check for reception */ |
1552 | if ((events & IEVENT_RXF0) || (events & IEVENT_RXB0)) | 1552 | if ((events & IEVENT_RXF0) || (events & IEVENT_RXB0)) |
1553 | gfar_receive(irq, dev_id, regs); | 1553 | gfar_receive(irq, dev_id); |
1554 | 1554 | ||
1555 | /* Check for transmit completion */ | 1555 | /* Check for transmit completion */ |
1556 | if ((events & IEVENT_TXF) || (events & IEVENT_TXB)) | 1556 | if ((events & IEVENT_TXF) || (events & IEVENT_TXB)) |
1557 | gfar_transmit(irq, dev_id, regs); | 1557 | gfar_transmit(irq, dev_id); |
1558 | 1558 | ||
1559 | /* Update error statistics */ | 1559 | /* Update error statistics */ |
1560 | if (events & IEVENT_TXE) { | 1560 | if (events & IEVENT_TXE) { |
@@ -1578,7 +1578,7 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1578 | priv->stats.rx_errors++; | 1578 | priv->stats.rx_errors++; |
1579 | priv->extra_stats.rx_bsy++; | 1579 | priv->extra_stats.rx_bsy++; |
1580 | 1580 | ||
1581 | gfar_receive(irq, dev_id, regs); | 1581 | gfar_receive(irq, dev_id); |
1582 | 1582 | ||
1583 | #ifndef CONFIG_GFAR_NAPI | 1583 | #ifndef CONFIG_GFAR_NAPI |
1584 | /* Clear the halt bit in RSTAT */ | 1584 | /* Clear the halt bit in RSTAT */ |
@@ -1857,7 +1857,7 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr) | |||
1857 | } | 1857 | } |
1858 | 1858 | ||
1859 | /* GFAR error interrupt handler */ | 1859 | /* GFAR error interrupt handler */ |
1860 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | 1860 | static irqreturn_t gfar_error(int irq, void *dev_id) |
1861 | { | 1861 | { |
1862 | struct net_device *dev = dev_id; | 1862 | struct net_device *dev = dev_id; |
1863 | struct gfar_private *priv = netdev_priv(dev); | 1863 | struct gfar_private *priv = netdev_priv(dev); |
@@ -1898,7 +1898,7 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | |||
1898 | priv->stats.rx_errors++; | 1898 | priv->stats.rx_errors++; |
1899 | priv->extra_stats.rx_bsy++; | 1899 | priv->extra_stats.rx_bsy++; |
1900 | 1900 | ||
1901 | gfar_receive(irq, dev_id, regs); | 1901 | gfar_receive(irq, dev_id); |
1902 | 1902 | ||
1903 | #ifndef CONFIG_GFAR_NAPI | 1903 | #ifndef CONFIG_GFAR_NAPI |
1904 | /* Clear the halt bit in RSTAT */ | 1904 | /* Clear the halt bit in RSTAT */ |