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>

1 files changed, 18 insertions, 18 deletions

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);