diff options
author | Joe Perches <joe@perches.com> | 2010-11-15 06:12:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-17 13:37:52 -0500 |
commit | ece49153b601d95bcebd45a6394e370972f0b0a0 (patch) | |
tree | d4471256b69ce4d71458dca460621990eec503be /drivers/net/xilinx_emaclite.c | |
parent | 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1 (diff) |
drivers/net: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xilinx_emaclite.c')
-rw-r--r-- | drivers/net/xilinx_emaclite.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 14f0955eca68..2de52d18152f 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
@@ -515,7 +515,7 @@ static void xemaclite_update_address(struct net_local *drvdata, | |||
515 | */ | 515 | */ |
516 | static int xemaclite_set_mac_address(struct net_device *dev, void *address) | 516 | static int xemaclite_set_mac_address(struct net_device *dev, void *address) |
517 | { | 517 | { |
518 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 518 | struct net_local *lp = netdev_priv(dev); |
519 | struct sockaddr *addr = address; | 519 | struct sockaddr *addr = address; |
520 | 520 | ||
521 | if (netif_running(dev)) | 521 | if (netif_running(dev)) |
@@ -534,7 +534,7 @@ static int xemaclite_set_mac_address(struct net_device *dev, void *address) | |||
534 | */ | 534 | */ |
535 | static void xemaclite_tx_timeout(struct net_device *dev) | 535 | static void xemaclite_tx_timeout(struct net_device *dev) |
536 | { | 536 | { |
537 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 537 | struct net_local *lp = netdev_priv(dev); |
538 | unsigned long flags; | 538 | unsigned long flags; |
539 | 539 | ||
540 | dev_err(&lp->ndev->dev, "Exceeded transmit timeout of %lu ms\n", | 540 | dev_err(&lp->ndev->dev, "Exceeded transmit timeout of %lu ms\n", |
@@ -578,7 +578,7 @@ static void xemaclite_tx_timeout(struct net_device *dev) | |||
578 | */ | 578 | */ |
579 | static void xemaclite_tx_handler(struct net_device *dev) | 579 | static void xemaclite_tx_handler(struct net_device *dev) |
580 | { | 580 | { |
581 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 581 | struct net_local *lp = netdev_priv(dev); |
582 | 582 | ||
583 | dev->stats.tx_packets++; | 583 | dev->stats.tx_packets++; |
584 | if (lp->deferred_skb) { | 584 | if (lp->deferred_skb) { |
@@ -605,7 +605,7 @@ static void xemaclite_tx_handler(struct net_device *dev) | |||
605 | */ | 605 | */ |
606 | static void xemaclite_rx_handler(struct net_device *dev) | 606 | static void xemaclite_rx_handler(struct net_device *dev) |
607 | { | 607 | { |
608 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 608 | struct net_local *lp = netdev_priv(dev); |
609 | struct sk_buff *skb; | 609 | struct sk_buff *skb; |
610 | unsigned int align; | 610 | unsigned int align; |
611 | u32 len; | 611 | u32 len; |
@@ -661,7 +661,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) | |||
661 | { | 661 | { |
662 | bool tx_complete = 0; | 662 | bool tx_complete = 0; |
663 | struct net_device *dev = dev_id; | 663 | struct net_device *dev = dev_id; |
664 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 664 | struct net_local *lp = netdev_priv(dev); |
665 | void __iomem *base_addr = lp->base_addr; | 665 | void __iomem *base_addr = lp->base_addr; |
666 | u32 tx_status; | 666 | u32 tx_status; |
667 | 667 | ||
@@ -918,7 +918,7 @@ void xemaclite_adjust_link(struct net_device *ndev) | |||
918 | */ | 918 | */ |
919 | static int xemaclite_open(struct net_device *dev) | 919 | static int xemaclite_open(struct net_device *dev) |
920 | { | 920 | { |
921 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 921 | struct net_local *lp = netdev_priv(dev); |
922 | int retval; | 922 | int retval; |
923 | 923 | ||
924 | /* Just to be safe, stop the device first */ | 924 | /* Just to be safe, stop the device first */ |
@@ -987,7 +987,7 @@ static int xemaclite_open(struct net_device *dev) | |||
987 | */ | 987 | */ |
988 | static int xemaclite_close(struct net_device *dev) | 988 | static int xemaclite_close(struct net_device *dev) |
989 | { | 989 | { |
990 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 990 | struct net_local *lp = netdev_priv(dev); |
991 | 991 | ||
992 | netif_stop_queue(dev); | 992 | netif_stop_queue(dev); |
993 | xemaclite_disable_interrupts(lp); | 993 | xemaclite_disable_interrupts(lp); |
@@ -1031,7 +1031,7 @@ static struct net_device_stats *xemaclite_get_stats(struct net_device *dev) | |||
1031 | */ | 1031 | */ |
1032 | static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) | 1032 | static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) |
1033 | { | 1033 | { |
1034 | struct net_local *lp = (struct net_local *) netdev_priv(dev); | 1034 | struct net_local *lp = netdev_priv(dev); |
1035 | struct sk_buff *new_skb; | 1035 | struct sk_buff *new_skb; |
1036 | unsigned int len; | 1036 | unsigned int len; |
1037 | unsigned long flags; | 1037 | unsigned long flags; |
@@ -1068,7 +1068,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) | |||
1068 | static void xemaclite_remove_ndev(struct net_device *ndev) | 1068 | static void xemaclite_remove_ndev(struct net_device *ndev) |
1069 | { | 1069 | { |
1070 | if (ndev) { | 1070 | if (ndev) { |
1071 | struct net_local *lp = (struct net_local *) netdev_priv(ndev); | 1071 | struct net_local *lp = netdev_priv(ndev); |
1072 | 1072 | ||
1073 | if (lp->base_addr) | 1073 | if (lp->base_addr) |
1074 | iounmap((void __iomem __force *) (lp->base_addr)); | 1074 | iounmap((void __iomem __force *) (lp->base_addr)); |
@@ -1245,7 +1245,7 @@ static int __devexit xemaclite_of_remove(struct platform_device *of_dev) | |||
1245 | struct device *dev = &of_dev->dev; | 1245 | struct device *dev = &of_dev->dev; |
1246 | struct net_device *ndev = dev_get_drvdata(dev); | 1246 | struct net_device *ndev = dev_get_drvdata(dev); |
1247 | 1247 | ||
1248 | struct net_local *lp = (struct net_local *) netdev_priv(ndev); | 1248 | struct net_local *lp = netdev_priv(ndev); |
1249 | 1249 | ||
1250 | /* Un-register the mii_bus, if configured */ | 1250 | /* Un-register the mii_bus, if configured */ |
1251 | if (lp->has_mdio) { | 1251 | if (lp->has_mdio) { |