1 files changed, 43 insertions, 45 deletions

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 1ac37e86b9bd..832679396b6c 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -134,7 +134,7 @@ static inline void wv_16_on(unsigned long ioaddr, u16 hacr)
  */
 static inline void wv_ints_off(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         
         lp->hacr &= ~HACR_INTRON;
@@ -148,7 +148,7 @@ static inline void wv_ints_off(struct net_device * dev)
  */
 static inline void wv_ints_on(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
 
         lp->hacr |= HACR_INTRON;
@@ -526,7 +526,7 @@ static inline void obram_write(unsigned long ioaddr, u16 o, u8 * b, int n)
  */
 static void wv_ack(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 scb_cs;
         int i;
@@ -568,7 +568,7 @@ static void wv_ack(struct net_device * dev)
  */
 static int wv_synchronous_cmd(struct net_device * dev, const char *str)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 scb_cmd;
         ach_t cb;
@@ -824,7 +824,7 @@ if (lp->tx_n_in_use > 0)
  */
 static void wv_82586_reconfig(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long flags;
 
         /* Arm the flag, will be cleard in wv_82586_config() */
@@ -922,7 +922,7 @@ static void wv_psa_show(psa_t * p)
 static void wv_mmc_show(struct net_device * dev)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         mmr_t m;
 
         /* Basic check */
@@ -1102,8 +1102,6 @@ static void wv_scb_show(unsigned long ioaddr)
  */
 static void wv_ru_show(struct net_device * dev)
 {
-        /* net_local *lp = (net_local *) dev->priv; */
-
         printk(KERN_DEBUG
                "##### WaveLAN i82586 receiver unit status: #####\n");
         printk(KERN_DEBUG "ru:");
@@ -1148,7 +1146,7 @@ static void wv_cu_show_one(struct net_device * dev, net_local * lp, int i, u16 p
  */
 static void wv_cu_show(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned int i;
         u16 p;
 
@@ -1190,7 +1188,7 @@ static void wv_local_show(struct net_device * dev)
 {
         net_local *lp;
 
-        lp = (net_local *) dev->priv;
+        lp = netdev_priv(dev);
 
         printk(KERN_DEBUG "local:");
         printk(" tx_n_in_use=%d,", lp->tx_n_in_use);
@@ -1250,7 +1248,7 @@ static inline void wv_packet_info(u8 * p,	/* Packet to dump */
 static void wv_init_info(struct net_device * dev)
 {
         short ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         psa_t psa;
 
         /* Read the parameter storage area */
@@ -1360,7 +1358,7 @@ static en_stats *wavelan_get_stats(struct net_device * dev)
         printk(KERN_DEBUG "%s: <>wavelan_get_stats()\n", dev->name);
 #endif
 
-        return (&((net_local *) dev->priv)->stats);
+        return &((net_local *)netdev_priv(dev))->stats;
 }
 
 /*------------------------------------------------------------------*/
@@ -1373,7 +1371,7 @@ static en_stats *wavelan_get_stats(struct net_device * dev)
  */
 static void wavelan_set_multicast_list(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
 
 #ifdef DEBUG_IOCTL_TRACE
         printk(KERN_DEBUG "%s: ->wavelan_set_multicast_list()\n",
@@ -1707,7 +1705,7 @@ static inline void wl_spy_gather(struct net_device * dev,
  */
 static inline void wl_his_gather(struct net_device * dev, u8 * stats)
 {                               /* Statistics to gather */
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         u8 level = stats[0] & MMR_SIGNAL_LVL;
         int i;
 
@@ -1744,7 +1742,7 @@ static int wavelan_set_nwid(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         mm_t m;
         unsigned long flags;
@@ -1803,7 +1801,7 @@ static int wavelan_get_nwid(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
         int ret = 0;
@@ -1835,7 +1833,7 @@ static int wavelan_set_freq(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         unsigned long flags;
         int ret;
 
@@ -1865,7 +1863,7 @@ static int wavelan_get_freq(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
         int ret = 0;
@@ -1911,7 +1909,7 @@ static int wavelan_set_sens(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
         int ret = 0;
@@ -1947,7 +1945,7 @@ static int wavelan_get_sens(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
         int ret = 0;
@@ -1978,7 +1976,7 @@ static int wavelan_set_encode(struct net_device *dev,
                               char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         unsigned long flags;
         psa_t psa;
         int ret = 0;
@@ -2048,7 +2046,7 @@ static int wavelan_get_encode(struct net_device *dev,
                               char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
         int ret = 0;
@@ -2095,7 +2093,7 @@ static int wavelan_get_range(struct net_device *dev,
                              char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         struct iw_range *range = (struct iw_range *) extra;
         unsigned long flags;
         int ret = 0;
@@ -2170,7 +2168,7 @@ static int wavelan_set_qthr(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
 
@@ -2202,7 +2200,7 @@ static int wavelan_get_qthr(struct net_device *dev,
                             char *extra)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
         psa_t psa;
         unsigned long flags;
 
@@ -2230,7 +2228,7 @@ static int wavelan_set_histo(struct net_device *dev,
                              union iwreq_data *wrqu,
                              char *extra)
 {
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
 
         /* Check the number of intervals. */
         if (wrqu->data.length > 16) {
@@ -2273,7 +2271,7 @@ static int wavelan_get_histo(struct net_device *dev,
                              union iwreq_data *wrqu,
                              char *extra)
 {
-        net_local *lp = (net_local *) dev->priv;        /* lp is not unused */
+        net_local *lp = netdev_priv(dev);       /* lp is not unused */
 
         /* Set the number of intervals. */
         wrqu->data.length = lp->his_number;
@@ -2377,7 +2375,7 @@ static const struct iw_handler_def	wavelan_handler_def =
 static iw_stats *wavelan_get_wireless_stats(struct net_device * dev)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         mmr_t m;
         iw_stats *wstats;
         unsigned long flags;
@@ -2452,7 +2450,7 @@ static iw_stats *wavelan_get_wireless_stats(struct net_device * dev)
 static void
 wv_packet_read(struct net_device * dev, u16 buf_off, int sksize)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         struct sk_buff *skb;
 
@@ -2546,7 +2544,7 @@ wv_packet_read(struct net_device * dev, u16 buf_off, int sksize)
 static void wv_receive(struct net_device * dev)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         fd_t fd;
         rbd_t rbd;
         int nreaped = 0;
@@ -2728,7 +2726,7 @@ static void wv_receive(struct net_device * dev)
  */
 static int wv_packet_write(struct net_device * dev, void *buf, short length)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         unsigned short txblock;
         unsigned short txpred;
@@ -2859,7 +2857,7 @@ static int wv_packet_write(struct net_device * dev, void *buf, short length)
  */
 static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long flags;
         char data[ETH_ZLEN];
 
@@ -2927,7 +2925,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
 static int wv_mmc_init(struct net_device * dev)
 {
         unsigned long ioaddr = dev->base_addr;
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         psa_t psa;
         mmw_t m;
         int configured;
@@ -3098,7 +3096,7 @@ static int wv_mmc_init(struct net_device * dev)
  */
 static int wv_ru_start(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 scb_cs;
         fd_t fd;
@@ -3190,7 +3188,7 @@ static int wv_ru_start(struct net_device * dev)
  */
 static int wv_cu_start(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         int i;
         u16 txblock;
@@ -3291,7 +3289,7 @@ static int wv_cu_start(struct net_device * dev)
  */
 static int wv_82586_start(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         scp_t scp;              /* system configuration pointer */
         iscp_t iscp;            /* intermediate scp */
@@ -3423,7 +3421,7 @@ static int wv_82586_start(struct net_device * dev)
  */
 static void wv_82586_config(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         unsigned short txblock;
         unsigned short txpred;
@@ -3599,7 +3597,7 @@ static void wv_82586_config(struct net_device * dev)
  */
 static void wv_82586_stop(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         u16 scb_cmd;
 
@@ -3636,7 +3634,7 @@ static void wv_82586_stop(struct net_device * dev)
  */
 static int wv_hw_reset(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
 
 #ifdef DEBUG_CONFIG_TRACE
@@ -3737,7 +3735,7 @@ static irqreturn_t wavelan_interrupt(int irq, void *dev_id)
         printk(KERN_DEBUG "%s: ->wavelan_interrupt()\n", dev->name);
 #endif
 
-        lp = (net_local *) dev->priv;
+        lp = netdev_priv(dev);
         ioaddr = dev->base_addr;
 
 #ifdef DEBUG_INTERRUPT_INFO
@@ -3880,7 +3878,7 @@ static irqreturn_t wavelan_interrupt(int irq, void *dev_id)
  */
 static void wavelan_watchdog(struct net_device *        dev)
 {
-        net_local *     lp = (net_local *)dev->priv;
+        net_local *lp = netdev_priv(dev);
         u_long          ioaddr = dev->base_addr;
         unsigned long   flags;
         unsigned int    nreaped;
@@ -3960,7 +3958,7 @@ static void wavelan_watchdog(struct net_device *	dev)
  */
 static int wavelan_open(struct net_device * dev)
 {
-        net_local *     lp = (net_local *)dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long   flags;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4015,7 +4013,7 @@ static int wavelan_open(struct net_device * dev)
  */
 static int wavelan_close(struct net_device * dev)
 {
-        net_local *lp = (net_local *) dev->priv;
+        net_local *lp = netdev_priv(dev);
         unsigned long flags;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4114,8 +4112,8 @@ static int __init wavelan_config(struct net_device *dev, unsigned short ioaddr)
         dev->if_port = 0;
 
         /* Initialize device structures */
-        memset(dev->priv, 0, sizeof(net_local));
-        lp = (net_local *) dev->priv;
+        memset(netdev_priv(dev), 0, sizeof(net_local));
+        lp = netdev_priv(dev);
 
         /* Back link to the device structure. */
         lp->dev = dev;