netdevice: safe convert to netdev_priv() #part-2

We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously
   netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it
directly.

This patch is a safe convert for netdev->priv to netdev_priv(netdev).
Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes,
which is max size allowed by vger.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

9 files changed, 79 insertions, 79 deletions

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 9fde748c41f2..3c58e67ef1e4 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -292,7 +292,7 @@ static int ali_ircc_open(int i, chipio_t *info)
                 return -ENOMEM;
         }
 
-        self = dev->priv;
+        self = netdev_priv(dev);
         self->netdev = dev;
         spin_lock_init(&self->lock);
    
@@ -665,7 +665,7 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id)
                 
         IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__);
                 
-        self = dev->priv;
+        self = netdev_priv(dev);
         
         spin_lock(&self->lock);
         
@@ -1333,7 +1333,7 @@ static int ali_ircc_net_open(struct net_device *dev)
         
         IRDA_ASSERT(dev != NULL, return -1;);
         
-        self = (struct ali_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         
         IRDA_ASSERT(self != NULL, return 0;);
         
@@ -1396,7 +1396,7 @@ static int ali_ircc_net_close(struct net_device *dev)
                 
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = (struct ali_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
         /* Stop device */
@@ -1436,7 +1436,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
         
         IRDA_DEBUG(1, "%s(), ---------------- Start -----------------\n", __func__ );
         
-        self = (struct ali_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         iobase = self->io.fir_base;
 
         netif_stop_queue(dev);
@@ -1959,7 +1959,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
         
         IRDA_ASSERT(dev != NULL, return 0;);
         
-        self = (struct ali_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
         iobase = self->io.sir_base;
@@ -2027,7 +2027,7 @@ static int ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -2113,7 +2113,7 @@ static int ali_ircc_is_receiving(struct ali_ircc_cb *self)
 
 static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev)
 {
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) dev->priv;
+        struct ali_ircc_cb *self = netdev_priv(dev);
         
         IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ );
                 
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 69d16b30323b..687c2d53d4d2 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -979,7 +979,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
   unsigned long flags;
   struct irda_skb_cb *cb = (struct irda_skb_cb *) skb->cb;
 
-  self = (struct toshoboe_cb *) dev->priv;
+  self = netdev_priv(dev);
 
   IRDA_ASSERT (self != NULL, return 0; );
 
@@ -1384,7 +1384,7 @@ toshoboe_net_close (struct net_device *dev)
   IRDA_DEBUG (4, "%s()\n", __func__);
 
   IRDA_ASSERT (dev != NULL, return -1; );
-  self = (struct toshoboe_cb *) dev->priv;
+  self = netdev_priv(dev);
 
   /* Stop device */
   netif_stop_queue(dev);
@@ -1422,7 +1422,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 
   IRDA_ASSERT (dev != NULL, return -1; );
 
-  self = dev->priv;
+  self = netdev_priv(dev);
 
   IRDA_ASSERT (self != NULL, return -1; );
 
@@ -1546,7 +1546,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
       return -ENOMEM;
     }
 
-  self = dev->priv;
+  self = netdev_priv(dev);
   self->netdev = dev;
   self->pdev = pci_dev;
   self->base = pci_resource_start(pci_dev,0);
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 761ed8ca6e37..205e4e825a97 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -384,7 +384,7 @@ static void speed_bulk_callback(struct urb *urb)
  */
 static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
-        struct irda_usb_cb *self = netdev->priv;
+        struct irda_usb_cb *self = netdev_priv(netdev);
         struct urb *urb = self->tx_urb;
         unsigned long flags;
         s32 speed;
@@ -628,7 +628,7 @@ static void write_bulk_callback(struct urb *urb)
 static void irda_usb_net_timeout(struct net_device *netdev)
 {
         unsigned long flags;
-        struct irda_usb_cb *self = netdev->priv;
+        struct irda_usb_cb *self = netdev_priv(netdev);
         struct urb *urb;
         int     done = 0;       /* If we have made any progress */
 
@@ -1174,7 +1174,7 @@ static int irda_usb_net_open(struct net_device *netdev)
         IRDA_DEBUG(1, "%s()\n", __func__);
 
         IRDA_ASSERT(netdev != NULL, return -1;);
-        self = (struct irda_usb_cb *) netdev->priv;
+        self = netdev_priv(netdev);
         IRDA_ASSERT(self != NULL, return -1;);
 
         spin_lock_irqsave(&self->lock, flags);
@@ -1256,7 +1256,7 @@ static int irda_usb_net_close(struct net_device *netdev)
         IRDA_DEBUG(1, "%s()\n", __func__);
 
         IRDA_ASSERT(netdev != NULL, return -1;);
-        self = (struct irda_usb_cb *) netdev->priv;
+        self = netdev_priv(netdev);
         IRDA_ASSERT(self != NULL, return -1;);
 
         /* Clear this flag *before* unlinking the urbs and *before*
@@ -1305,7 +1305,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         int ret = 0;
 
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return -1;);
 
         IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
@@ -1347,7 +1347,7 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  */
 static struct net_device_stats *irda_usb_net_get_stats(struct net_device *dev)
 {
-        struct irda_usb_cb *self = dev->priv;
+        struct irda_usb_cb *self = netdev_priv(dev);
         return &self->stats;
 }
 
@@ -1640,7 +1640,7 @@ static int irda_usb_probe(struct usb_interface *intf,
                 goto err_out;
 
         SET_NETDEV_DEV(net, &intf->dev);
-        self = net->priv;
+        self = netdev_priv(net);
         self->netdev = net;
         spin_lock_init(&self->lock);
         init_timer(&self->rx_defer_timer);
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 4e1bc08971a8..2c6bf2d11bb1 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -373,7 +373,7 @@ static int __init nsc_ircc_open(chipio_t *info)
                 return -ENOMEM;
         }
 
-        self = dev->priv;
+        self = netdev_priv(dev);
         self->netdev = dev;
         spin_lock_init(&self->lock);
    
@@ -1354,7 +1354,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
         __s32 speed;
         __u8 bank;
         
-        self = (struct nsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return 0;);
 
@@ -1427,7 +1427,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
         __u8 bank;
         int mtt, diff;
         
-        self = (struct nsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         iobase = self->io.fir_base;
 
         netif_stop_queue(dev);
@@ -2084,7 +2084,7 @@ static irqreturn_t nsc_ircc_interrupt(int irq, void *dev_id)
         __u8 bsr, eir;
         int iobase;
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         spin_lock(&self->lock); 
 
@@ -2165,7 +2165,7 @@ static int nsc_ircc_net_open(struct net_device *dev)
         IRDA_DEBUG(4, "%s()\n", __func__);
         
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct nsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         
         IRDA_ASSERT(self != NULL, return 0;);
         
@@ -2228,7 +2228,7 @@ static int nsc_ircc_net_close(struct net_device *dev)
         
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = (struct nsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
         /* Stop device */
@@ -2274,7 +2274,7 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -2309,7 +2309,7 @@ static int nsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 static struct net_device_stats *nsc_ircc_net_get_stats(struct net_device *dev)
 {
-        struct nsc_ircc_cb *self = (struct nsc_ircc_cb *) dev->priv;
+        struct nsc_ircc_cb *self = netdev_priv(dev);
         
         return &self->stats;
 }
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index aa6fef8ff130..ccde5829ba21 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -298,7 +298,7 @@ static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
         if (!dev)
                 return 0;
 
-        si = dev->priv;
+        si = netdev_priv(dev);
         if (si->open) {
                 /*
                  * Stop the transmit queue
@@ -323,7 +323,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)
         if (!dev)
                 return 0;
 
-        si = dev->priv;
+        si = netdev_priv(dev);
         if (si->open) {
                 /*
                  * If we missed a speed change, initialise at the new speed
@@ -359,7 +359,7 @@ static int sa1100_irda_resume(struct platform_device *pdev)
  */
 static void sa1100_irda_hpsir_irq(struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         int status;
 
         status = Ser2UTSR0;
@@ -532,7 +532,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
  */
 static void sa1100_irda_fir_irq(struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
 
         /*
          * Stop RX DMA
@@ -580,7 +580,7 @@ static void sa1100_irda_fir_irq(struct net_device *dev)
 static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
-        if (IS_FIR(((struct sa1100_irda *)dev->priv)))
+        if (IS_FIR(((struct sa1100_irda *)netdev_priv(dev))))
                 sa1100_irda_fir_irq(dev);
         else
                 sa1100_irda_hpsir_irq(dev);
@@ -593,7 +593,7 @@ static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)
 static void sa1100_irda_txdma_irq(void *id)
 {
         struct net_device *dev = id;
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         struct sk_buff *skb = si->txskb;
 
         si->txskb = NULL;
@@ -647,7 +647,7 @@ static void sa1100_irda_txdma_irq(void *id)
 
 static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         int speed = irda_get_next_speed(skb);
 
         /*
@@ -722,7 +722,7 @@ static int
 sa1100_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
 {
         struct if_irda_req *rq = (struct if_irda_req *)ifreq;
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         int ret = -EOPNOTSUPP;
 
         switch (cmd) {
@@ -764,13 +764,13 @@ sa1100_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
 
 static struct net_device_stats *sa1100_irda_stats(struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         return &si->stats;
 }
 
 static int sa1100_irda_start(struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
         int err;
 
         si->speed = 9600;
@@ -833,7 +833,7 @@ err_irq:
 
 static int sa1100_irda_stop(struct net_device *dev)
 {
-        struct sa1100_irda *si = dev->priv;
+        struct sa1100_irda *si = netdev_priv(dev);
 
         disable_irq(dev->irq);
         sa1100_irda_shutdown(si);
@@ -906,7 +906,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)
         if (!dev)
                 goto err_mem_4;
 
-        si = dev->priv;
+        si = netdev_priv(dev);
         si->dev = &pdev->dev;
         si->pdata = pdev->dev.platform_data;
 
@@ -985,7 +985,7 @@ static int sa1100_irda_remove(struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
 
         if (dev) {
-                struct sa1100_irda *si = dev->priv;
+                struct sa1100_irda *si = netdev_priv(dev);
                 unregister_netdev(dev);
                 kfree(si->tx_buff.head);
                 kfree(si->rx_buff.head);
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index 3f32909c24c8..ceef040aa76d 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -584,14 +584,14 @@ EXPORT_SYMBOL(sirdev_receive);
 
 static struct net_device_stats *sirdev_get_stats(struct net_device *ndev)
 {
-        struct sir_dev *dev = ndev->priv;
+        struct sir_dev *dev = netdev_priv(ndev);
 
         return (dev) ? &dev->stats : NULL;
 }
 
 static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        struct sir_dev *dev = ndev->priv;
+        struct sir_dev *dev = netdev_priv(ndev);
         unsigned long flags;
         int actual = 0;
         int err;
@@ -683,7 +683,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 static int sirdev_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
         struct if_irda_req *irq = (struct if_irda_req *) rq;
-        struct sir_dev *dev = ndev->priv;
+        struct sir_dev *dev = netdev_priv(ndev);
         int ret = 0;
 
         IRDA_ASSERT(dev != NULL, return -1;);
@@ -795,7 +795,7 @@ static void sirdev_free_buffers(struct sir_dev *dev)
 
 static int sirdev_open(struct net_device *ndev)
 {
-        struct sir_dev *dev = ndev->priv;
+        struct sir_dev *dev = netdev_priv(ndev);
         const struct sir_driver *drv = dev->drv;
 
         if (!drv)
@@ -840,7 +840,7 @@ errout_dec:
 
 static int sirdev_close(struct net_device *ndev)
 {
-        struct sir_dev *dev = ndev->priv;
+        struct sir_dev *dev = netdev_priv(ndev);
         const struct sir_driver *drv;
 
 //      IRDA_DEBUG(0, "%s\n", __func__);
@@ -896,7 +896,7 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n
                 IRDA_ERROR("%s - Can't allocate memory for IrDA control block!\n", __func__);
                 goto out;
         }
-        dev = ndev->priv;
+        dev = netdev_priv(ndev);
 
         irda_init_max_qos_capabilies(&dev->qos);
         dev->qos.baud_rate.bits = IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 84e609ea5fbb..74c78cf7a333 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -334,7 +334,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
         if (dev == NULL) 
                 return -ENOMEM;
 
-        self = dev->priv;
+        self = netdev_priv(dev);
         self->netdev = dev;
         spin_lock_init(&self->lock);
 
@@ -824,7 +824,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb,
         u16 iobase;
         __u32 speed;
 
-        self = (struct via_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
         iobase = self->io.fir_base;
 
@@ -896,7 +896,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
         __u32 speed;
         unsigned long flags;
 
-        self = (struct via_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         iobase = self->io.fir_base;
 
         if (self->st_fifo.len)
@@ -1349,7 +1349,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
 static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
 {
         struct net_device *dev = dev_id;
-        struct via_ircc_cb *self = dev->priv;
+        struct via_ircc_cb *self = netdev_priv(dev);
         int iobase;
         u8 iHostIntType, iRxIntType, iTxIntType;
 
@@ -1522,7 +1522,7 @@ static int via_ircc_net_open(struct net_device *dev)
         IRDA_DEBUG(3, "%s()\n", __func__);
 
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct via_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         self->stats.rx_packets = 0;
         IRDA_ASSERT(self != NULL, return 0;);
         iobase = self->io.fir_base;
@@ -1589,7 +1589,7 @@ static int via_ircc_net_close(struct net_device *dev)
         IRDA_DEBUG(3, "%s()\n", __func__);
 
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct via_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
         /* Stop device */
@@ -1628,7 +1628,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,
         int ret = 0;
 
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_DEBUG(1, "%s(), %s, (cmd=0x%X)\n", __func__, dev->name,
                    cmd);
@@ -1663,7 +1663,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,
 static struct net_device_stats *via_ircc_net_get_stats(struct net_device
                                                        *dev)
 {
-        struct via_ircc_cb *self = (struct via_ircc_cb *) dev->priv;
+        struct via_ircc_cb *self = netdev_priv(dev);
 
         return &self->stats;
 }
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index a3d27d78fc89..0d30f8d659a1 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -178,7 +178,7 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev)
                 
 static void vlsi_proc_ndev(struct seq_file *seq, struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         u8 byte;
         u16 word;
         unsigned delta1, delta2;
@@ -346,7 +346,7 @@ static void vlsi_proc_ring(struct seq_file *seq, struct vlsi_ring *r)
 static int vlsi_seq_show(struct seq_file *seq, void *v)
 {
         struct net_device *ndev = seq->private;
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         unsigned long flags;
 
         seq_printf(seq, "\n%s %s\n\n", DRIVER_NAME, DRIVER_VERSION);
@@ -543,7 +543,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
         struct sk_buff  *skb;
         int             ret = 0;
         struct net_device *ndev = (struct net_device *)pci_get_drvdata(r->pdev);
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
 
         pci_dma_sync_single_for_cpu(r->pdev, rd_get_addr(rd), r->len, r->dir);
         /* dma buffer now owned by the CPU */
@@ -637,7 +637,7 @@ static void vlsi_fill_rx(struct vlsi_ring *r)
 
 static void vlsi_rx_interrupt(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         struct vlsi_ring *r = idev->rx_ring;
         struct ring_descr *rd;
         int ret;
@@ -855,7 +855,7 @@ static int vlsi_set_baud(vlsi_irda_dev_t *idev, unsigned iobase)
 
 static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         struct vlsi_ring        *r = idev->tx_ring;
         struct ring_descr *rd;
         unsigned long flags;
@@ -1062,7 +1062,7 @@ drop:
 
 static void vlsi_tx_interrupt(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         struct vlsi_ring        *r = idev->tx_ring;
         struct ring_descr       *rd;
         unsigned        iobase;
@@ -1261,7 +1261,7 @@ static inline void vlsi_clear_regs(unsigned iobase)
 static int vlsi_init_chip(struct pci_dev *pdev)
 {
         struct net_device *ndev = pci_get_drvdata(pdev);
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         unsigned        iobase;
         u16 ptr;
 
@@ -1375,14 +1375,14 @@ static int vlsi_stop_hw(vlsi_irda_dev_t *idev)
 
 static struct net_device_stats * vlsi_get_stats(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
 
         return &idev->stats;
 }
 
 static void vlsi_tx_timeout(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
 
 
         vlsi_reg_debug(ndev->base_addr, __func__);
@@ -1407,7 +1407,7 @@ static void vlsi_tx_timeout(struct net_device *ndev)
 
 static int vlsi_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         struct if_irda_req *irq = (struct if_irda_req *) rq;
         unsigned long flags;
         u16 fifocnt;
@@ -1457,7 +1457,7 @@ static int vlsi_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 static irqreturn_t vlsi_interrupt(int irq, void *dev_instance)
 {
         struct net_device *ndev = dev_instance;
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         unsigned        iobase;
         u8              irintr;
         int             boguscount = 5;
@@ -1498,7 +1498,7 @@ static irqreturn_t vlsi_interrupt(int irq, void *dev_instance)
 
 static int vlsi_open(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         int     err = -EAGAIN;
         char    hwname[32];
 
@@ -1557,7 +1557,7 @@ errout:
 
 static int vlsi_close(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
 
         netif_stop_queue(ndev);
 
@@ -1580,7 +1580,7 @@ static int vlsi_close(struct net_device *ndev)
 
 static int vlsi_irda_init(struct net_device *ndev)
 {
-        vlsi_irda_dev_t *idev = ndev->priv;
+        vlsi_irda_dev_t *idev = netdev_priv(ndev);
         struct pci_dev *pdev = idev->pdev;
 
         ndev->irq = pdev->irq;
@@ -1655,7 +1655,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_disable;
         }
 
-        idev = ndev->priv;
+        idev = netdev_priv(ndev);
 
         spin_lock_init(&idev->lock);
         mutex_init(&idev->mtx);
@@ -1712,7 +1712,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
 
         unregister_netdev(ndev);
 
-        idev = ndev->priv;
+        idev = netdev_priv(ndev);
         mutex_lock(&idev->mtx);
         if (idev->proc_entry) {
                 remove_proc_entry(ndev->name, vlsi_proc_root);
@@ -1747,7 +1747,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
                            __func__, pci_name(pdev));
                 return 0;
         }
-        idev = ndev->priv;      
+        idev = netdev_priv(ndev);
         mutex_lock(&idev->mtx);
         if (pdev->current_state != 0) {                 /* already suspended */
                 if (state.event > pdev->current_state) {        /* simply go deeper */
@@ -1786,7 +1786,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
                            __func__, pci_name(pdev));
                 return 0;
         }
-        idev = ndev->priv;      
+        idev = netdev_priv(ndev);
         mutex_lock(&idev->mtx);
         if (pdev->current_state == 0) {
                 mutex_unlock(&idev->mtx);
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index fa600200ac01..161d591aeb97 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -178,7 +178,7 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq,
                 goto err_out;
         }
 
-        self = dev->priv;
+        self = netdev_priv(dev);
         spin_lock_init(&self->lock);
    
 
@@ -497,7 +497,7 @@ int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
         __u8 set;
         int mtt;
         
-        self = (struct w83977af_ir *) dev->priv;
+        self = netdev_priv(dev);
 
         iobase = self->io.fir_base;
 
@@ -1118,7 +1118,7 @@ static irqreturn_t w83977af_interrupt(int irq, void *dev_id)
         __u8 set, icr, isr;
         int iobase;
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         iobase = self->io.fir_base;
 
@@ -1191,7 +1191,7 @@ static int w83977af_net_open(struct net_device *dev)
         IRDA_DEBUG(0, "%s()\n", __func__ );
         
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct w83977af_ir *) dev->priv;
+        self = netdev_priv(dev);
         
         IRDA_ASSERT(self != NULL, return 0;);
         
@@ -1255,7 +1255,7 @@ static int w83977af_net_close(struct net_device *dev)
 
         IRDA_ASSERT(dev != NULL, return -1;);
         
-        self = (struct w83977af_ir *) dev->priv;
+        self = netdev_priv(dev);
         
         IRDA_ASSERT(self != NULL, return 0;);
         
@@ -1302,7 +1302,7 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -1338,7 +1338,7 @@ out:
 
 static struct net_device_stats *w83977af_net_get_stats(struct net_device *dev)
 {
-        struct w83977af_ir *self = (struct w83977af_ir *) dev->priv;
+        struct w83977af_ir *self = netdev_priv(dev);
         
         return &self->stats;
 }