diff options
author | Joe Perches <joe@perches.com> | 2010-11-15 06:12:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-17 13:36:51 -0500 |
commit | a887e220760c12e00b0591d67987e26f6e270d71 (patch) | |
tree | a89f836dd0649c3baaf302ff216fdff7c9b29a38 /drivers/net/pcmcia | |
parent | c04914af6861d62df303aeedbbe554972ce4e736 (diff) |
drivers/net/pcmcia: 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/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 8a4d19e5de06..1a0eb128e607 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -875,7 +875,7 @@ static void do_set_multicast_list(struct net_device *dev); | |||
875 | static int ax_open(struct net_device *dev) | 875 | static int ax_open(struct net_device *dev) |
876 | { | 876 | { |
877 | unsigned long flags; | 877 | unsigned long flags; |
878 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 878 | struct ei_device *ei_local = netdev_priv(dev); |
879 | 879 | ||
880 | /* | 880 | /* |
881 | * Grab the page lock so we own the register set, then call | 881 | * Grab the page lock so we own the register set, then call |
@@ -926,7 +926,7 @@ static int ax_close(struct net_device *dev) | |||
926 | static void axnet_tx_timeout(struct net_device *dev) | 926 | static void axnet_tx_timeout(struct net_device *dev) |
927 | { | 927 | { |
928 | long e8390_base = dev->base_addr; | 928 | long e8390_base = dev->base_addr; |
929 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 929 | struct ei_device *ei_local = netdev_priv(dev); |
930 | int txsr, isr, tickssofar = jiffies - dev_trans_start(dev); | 930 | int txsr, isr, tickssofar = jiffies - dev_trans_start(dev); |
931 | unsigned long flags; | 931 | unsigned long flags; |
932 | 932 | ||
@@ -973,7 +973,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, | |||
973 | struct net_device *dev) | 973 | struct net_device *dev) |
974 | { | 974 | { |
975 | long e8390_base = dev->base_addr; | 975 | long e8390_base = dev->base_addr; |
976 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 976 | struct ei_device *ei_local = netdev_priv(dev); |
977 | int length, send_length, output_page; | 977 | int length, send_length, output_page; |
978 | unsigned long flags; | 978 | unsigned long flags; |
979 | u8 packet[ETH_ZLEN]; | 979 | u8 packet[ETH_ZLEN]; |
@@ -1270,7 +1270,7 @@ static void ei_tx_err(struct net_device *dev) | |||
1270 | static void ei_tx_intr(struct net_device *dev) | 1270 | static void ei_tx_intr(struct net_device *dev) |
1271 | { | 1271 | { |
1272 | long e8390_base = dev->base_addr; | 1272 | long e8390_base = dev->base_addr; |
1273 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1273 | struct ei_device *ei_local = netdev_priv(dev); |
1274 | int status = inb(e8390_base + EN0_TSR); | 1274 | int status = inb(e8390_base + EN0_TSR); |
1275 | 1275 | ||
1276 | /* | 1276 | /* |
@@ -1354,7 +1354,7 @@ static void ei_tx_intr(struct net_device *dev) | |||
1354 | static void ei_receive(struct net_device *dev) | 1354 | static void ei_receive(struct net_device *dev) |
1355 | { | 1355 | { |
1356 | long e8390_base = dev->base_addr; | 1356 | long e8390_base = dev->base_addr; |
1357 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1357 | struct ei_device *ei_local = netdev_priv(dev); |
1358 | unsigned char rxing_page, this_frame, next_frame; | 1358 | unsigned char rxing_page, this_frame, next_frame; |
1359 | unsigned short current_offset; | 1359 | unsigned short current_offset; |
1360 | int rx_pkt_count = 0; | 1360 | int rx_pkt_count = 0; |
@@ -1539,7 +1539,7 @@ static void ei_rx_overrun(struct net_device *dev) | |||
1539 | static struct net_device_stats *get_stats(struct net_device *dev) | 1539 | static struct net_device_stats *get_stats(struct net_device *dev) |
1540 | { | 1540 | { |
1541 | long ioaddr = dev->base_addr; | 1541 | long ioaddr = dev->base_addr; |
1542 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1542 | struct ei_device *ei_local = netdev_priv(dev); |
1543 | unsigned long flags; | 1543 | unsigned long flags; |
1544 | 1544 | ||
1545 | /* If the card is stopped, just return the present stats. */ | 1545 | /* If the card is stopped, just return the present stats. */ |
@@ -1588,7 +1588,7 @@ static void do_set_multicast_list(struct net_device *dev) | |||
1588 | { | 1588 | { |
1589 | long e8390_base = dev->base_addr; | 1589 | long e8390_base = dev->base_addr; |
1590 | int i; | 1590 | int i; |
1591 | struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev); | 1591 | struct ei_device *ei_local = netdev_priv(dev); |
1592 | 1592 | ||
1593 | if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) { | 1593 | if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) { |
1594 | memset(ei_local->mcfilter, 0, 8); | 1594 | memset(ei_local->mcfilter, 0, 8); |
@@ -1646,7 +1646,7 @@ static void AX88190_init(struct net_device *dev, int startp) | |||
1646 | { | 1646 | { |
1647 | axnet_dev_t *info = PRIV(dev); | 1647 | axnet_dev_t *info = PRIV(dev); |
1648 | long e8390_base = dev->base_addr; | 1648 | long e8390_base = dev->base_addr; |
1649 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1649 | struct ei_device *ei_local = netdev_priv(dev); |
1650 | int i; | 1650 | int i; |
1651 | int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS) : 0x48; | 1651 | int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS) : 0x48; |
1652 | 1652 | ||
@@ -1712,7 +1712,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length, | |||
1712 | int start_page) | 1712 | int start_page) |
1713 | { | 1713 | { |
1714 | long e8390_base = dev->base_addr; | 1714 | long e8390_base = dev->base_addr; |
1715 | struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) netdev_priv(dev); | 1715 | struct ei_device *ei_local __attribute((unused)) = netdev_priv(dev); |
1716 | 1716 | ||
1717 | if (inb_p(e8390_base) & E8390_TRANS) | 1717 | if (inb_p(e8390_base) & E8390_TRANS) |
1718 | { | 1718 | { |