diff options
Diffstat (limited to 'drivers/net/atarilance.c')
-rw-r--r-- | drivers/net/atarilance.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 701214b3b261..2d81f6afcb58 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -520,7 +520,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
520 | return( 0 ); | 520 | return( 0 ); |
521 | 521 | ||
522 | probe_ok: | 522 | probe_ok: |
523 | lp = (struct lance_private *)dev->priv; | 523 | lp = netdev_priv(dev); |
524 | MEM = (struct lance_memory *)memaddr; | 524 | MEM = (struct lance_memory *)memaddr; |
525 | IO = lp->iobase = (struct lance_ioreg *)ioaddr; | 525 | IO = lp->iobase = (struct lance_ioreg *)ioaddr; |
526 | dev->base_addr = (unsigned long)ioaddr; /* informational only */ | 526 | dev->base_addr = (unsigned long)ioaddr; /* informational only */ |
@@ -639,8 +639,8 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
639 | 639 | ||
640 | 640 | ||
641 | static int lance_open( struct net_device *dev ) | 641 | static int lance_open( struct net_device *dev ) |
642 | 642 | { | |
643 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 643 | struct lance_private *lp = netdev_priv(dev); |
644 | struct lance_ioreg *IO = lp->iobase; | 644 | struct lance_ioreg *IO = lp->iobase; |
645 | int i; | 645 | int i; |
646 | 646 | ||
@@ -680,8 +680,8 @@ static int lance_open( struct net_device *dev ) | |||
680 | /* Initialize the LANCE Rx and Tx rings. */ | 680 | /* Initialize the LANCE Rx and Tx rings. */ |
681 | 681 | ||
682 | static void lance_init_ring( struct net_device *dev ) | 682 | static void lance_init_ring( struct net_device *dev ) |
683 | 683 | { | |
684 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 684 | struct lance_private *lp = netdev_priv(dev); |
685 | int i; | 685 | int i; |
686 | unsigned offset; | 686 | unsigned offset; |
687 | 687 | ||
@@ -729,7 +729,7 @@ static void lance_init_ring( struct net_device *dev ) | |||
729 | 729 | ||
730 | static void lance_tx_timeout (struct net_device *dev) | 730 | static void lance_tx_timeout (struct net_device *dev) |
731 | { | 731 | { |
732 | struct lance_private *lp = (struct lance_private *) dev->priv; | 732 | struct lance_private *lp = netdev_priv(dev); |
733 | struct lance_ioreg *IO = lp->iobase; | 733 | struct lance_ioreg *IO = lp->iobase; |
734 | 734 | ||
735 | AREG = CSR0; | 735 | AREG = CSR0; |
@@ -771,8 +771,8 @@ static void lance_tx_timeout (struct net_device *dev) | |||
771 | /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ | 771 | /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ |
772 | 772 | ||
773 | static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | 773 | static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) |
774 | 774 | { | |
775 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 775 | struct lance_private *lp = netdev_priv(dev); |
776 | struct lance_ioreg *IO = lp->iobase; | 776 | struct lance_ioreg *IO = lp->iobase; |
777 | int entry, len; | 777 | int entry, len; |
778 | struct lance_tx_head *head; | 778 | struct lance_tx_head *head; |
@@ -860,7 +860,7 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id ) | |||
860 | return IRQ_NONE; | 860 | return IRQ_NONE; |
861 | } | 861 | } |
862 | 862 | ||
863 | lp = (struct lance_private *)dev->priv; | 863 | lp = netdev_priv(dev); |
864 | IO = lp->iobase; | 864 | IO = lp->iobase; |
865 | spin_lock (&lp->devlock); | 865 | spin_lock (&lp->devlock); |
866 | 866 | ||
@@ -960,8 +960,8 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id ) | |||
960 | 960 | ||
961 | 961 | ||
962 | static int lance_rx( struct net_device *dev ) | 962 | static int lance_rx( struct net_device *dev ) |
963 | 963 | { | |
964 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 964 | struct lance_private *lp = netdev_priv(dev); |
965 | int entry = lp->cur_rx & RX_RING_MOD_MASK; | 965 | int entry = lp->cur_rx & RX_RING_MOD_MASK; |
966 | int i; | 966 | int i; |
967 | 967 | ||
@@ -1049,8 +1049,8 @@ static int lance_rx( struct net_device *dev ) | |||
1049 | 1049 | ||
1050 | 1050 | ||
1051 | static int lance_close( struct net_device *dev ) | 1051 | static int lance_close( struct net_device *dev ) |
1052 | 1052 | { | |
1053 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 1053 | struct lance_private *lp = netdev_priv(dev); |
1054 | struct lance_ioreg *IO = lp->iobase; | 1054 | struct lance_ioreg *IO = lp->iobase; |
1055 | 1055 | ||
1056 | netif_stop_queue (dev); | 1056 | netif_stop_queue (dev); |
@@ -1076,8 +1076,8 @@ static int lance_close( struct net_device *dev ) | |||
1076 | */ | 1076 | */ |
1077 | 1077 | ||
1078 | static void set_multicast_list( struct net_device *dev ) | 1078 | static void set_multicast_list( struct net_device *dev ) |
1079 | 1079 | { | |
1080 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 1080 | struct lance_private *lp = netdev_priv(dev); |
1081 | struct lance_ioreg *IO = lp->iobase; | 1081 | struct lance_ioreg *IO = lp->iobase; |
1082 | 1082 | ||
1083 | if (netif_running(dev)) | 1083 | if (netif_running(dev)) |
@@ -1118,8 +1118,8 @@ static void set_multicast_list( struct net_device *dev ) | |||
1118 | /* This is needed for old RieblCards and possible for new RieblCards */ | 1118 | /* This is needed for old RieblCards and possible for new RieblCards */ |
1119 | 1119 | ||
1120 | static int lance_set_mac_address( struct net_device *dev, void *addr ) | 1120 | static int lance_set_mac_address( struct net_device *dev, void *addr ) |
1121 | 1121 | { | |
1122 | { struct lance_private *lp = (struct lance_private *)dev->priv; | 1122 | struct lance_private *lp = netdev_priv(dev); |
1123 | struct sockaddr *saddr = addr; | 1123 | struct sockaddr *saddr = addr; |
1124 | int i; | 1124 | int i; |
1125 | 1125 | ||