diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/via-rhine.c | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff) |
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like:
int retval = NETDEV_TX_OK;
...
return retval;
into
return NETDEV_TX_OK;
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 46eb618bbc90..081402cb05fd 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -408,7 +408,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int location); | |||
408 | static void mdio_write(struct net_device *dev, int phy_id, int location, int value); | 408 | static void mdio_write(struct net_device *dev, int phy_id, int location, int value); |
409 | static int rhine_open(struct net_device *dev); | 409 | static int rhine_open(struct net_device *dev); |
410 | static void rhine_tx_timeout(struct net_device *dev); | 410 | static void rhine_tx_timeout(struct net_device *dev); |
411 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev); | 411 | static netdev_tx_t rhine_start_tx(struct sk_buff *skb, |
412 | struct net_device *dev); | ||
412 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance); | 413 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance); |
413 | static void rhine_tx(struct net_device *dev); | 414 | static void rhine_tx(struct net_device *dev); |
414 | static int rhine_rx(struct net_device *dev, int limit); | 415 | static int rhine_rx(struct net_device *dev, int limit); |
@@ -1213,7 +1214,8 @@ static void rhine_tx_timeout(struct net_device *dev) | |||
1213 | netif_wake_queue(dev); | 1214 | netif_wake_queue(dev); |
1214 | } | 1215 | } |
1215 | 1216 | ||
1216 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | 1217 | static netdev_tx_t rhine_start_tx(struct sk_buff *skb, |
1218 | struct net_device *dev) | ||
1217 | { | 1219 | { |
1218 | struct rhine_private *rp = netdev_priv(dev); | 1220 | struct rhine_private *rp = netdev_priv(dev); |
1219 | void __iomem *ioaddr = rp->base; | 1221 | void __iomem *ioaddr = rp->base; |