Commit a887e220 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

drivers/net/pcmcia: Remove unnecessary casts of netdev_priv

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c04914af
...@@ -875,7 +875,7 @@ static void do_set_multicast_list(struct net_device *dev); ...@@ -875,7 +875,7 @@ static void do_set_multicast_list(struct net_device *dev);
static int ax_open(struct net_device *dev) static int ax_open(struct net_device *dev)
{ {
unsigned long flags; unsigned long flags;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
/* /*
* Grab the page lock so we own the register set, then call * 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,7 +926,7 @@ static int ax_close(struct net_device *dev)
static void axnet_tx_timeout(struct net_device *dev) static void axnet_tx_timeout(struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
int txsr, isr, tickssofar = jiffies - dev_trans_start(dev); int txsr, isr, tickssofar = jiffies - dev_trans_start(dev);
unsigned long flags; unsigned long flags;
...@@ -973,7 +973,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, ...@@ -973,7 +973,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
int length, send_length, output_page; int length, send_length, output_page;
unsigned long flags; unsigned long flags;
u8 packet[ETH_ZLEN]; u8 packet[ETH_ZLEN];
...@@ -1270,7 +1270,7 @@ static void ei_tx_err(struct net_device *dev) ...@@ -1270,7 +1270,7 @@ static void ei_tx_err(struct net_device *dev)
static void ei_tx_intr(struct net_device *dev) static void ei_tx_intr(struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
int status = inb(e8390_base + EN0_TSR); int status = inb(e8390_base + EN0_TSR);
/* /*
...@@ -1354,7 +1354,7 @@ static void ei_tx_intr(struct net_device *dev) ...@@ -1354,7 +1354,7 @@ static void ei_tx_intr(struct net_device *dev)
static void ei_receive(struct net_device *dev) static void ei_receive(struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
unsigned char rxing_page, this_frame, next_frame; unsigned char rxing_page, this_frame, next_frame;
unsigned short current_offset; unsigned short current_offset;
int rx_pkt_count = 0; int rx_pkt_count = 0;
...@@ -1539,7 +1539,7 @@ static void ei_rx_overrun(struct net_device *dev) ...@@ -1539,7 +1539,7 @@ static void ei_rx_overrun(struct net_device *dev)
static struct net_device_stats *get_stats(struct net_device *dev) static struct net_device_stats *get_stats(struct net_device *dev)
{ {
long ioaddr = dev->base_addr; long ioaddr = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
unsigned long flags; unsigned long flags;
/* If the card is stopped, just return the present stats. */ /* 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,7 +1588,7 @@ static void do_set_multicast_list(struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
int i; int i;
struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) { if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) {
memset(ei_local->mcfilter, 0, 8); memset(ei_local->mcfilter, 0, 8);
...@@ -1646,7 +1646,7 @@ static void AX88190_init(struct net_device *dev, int startp) ...@@ -1646,7 +1646,7 @@ static void AX88190_init(struct net_device *dev, int startp)
{ {
axnet_dev_t *info = PRIV(dev); axnet_dev_t *info = PRIV(dev);
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = netdev_priv(dev);
int i; int i;
int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS) : 0x48; int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS) : 0x48;
...@@ -1712,7 +1712,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length, ...@@ -1712,7 +1712,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length,
int start_page) int start_page)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local __attribute((unused)) = netdev_priv(dev);
if (inb_p(e8390_base) & E8390_TRANS) if (inb_p(e8390_base) & E8390_TRANS)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment