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

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>

3 files changed, 24 insertions, 24 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index e23a5084c6ca..3aa60fad68c7 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -483,7 +483,7 @@ rx_next:
 static irqreturn_t de_interrupt (int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         u32 status;
 
         status = dr32(MacStatus);
@@ -589,7 +589,7 @@ next:
 
 static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         unsigned int entry, tx_free;
         u32 mapping, len, flags = FirstFrag | LastFrag;
         struct de_desc *txd;
@@ -652,7 +652,7 @@ static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         u16 hash_table[32];
         struct dev_mc_list *mclist;
         int i;
@@ -683,7 +683,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 
 static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         struct dev_mc_list *mclist;
         int i;
         u16 *eaddrs;
@@ -711,7 +711,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
 
 static void __de_set_rx_mode (struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         u32 macmode;
         unsigned int entry;
         u32 mapping;
@@ -796,7 +796,7 @@ out:
 static void de_set_rx_mode (struct net_device *dev)
 {
         unsigned long flags;
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         spin_lock_irqsave (&de->lock, flags);
         __de_set_rx_mode(dev);
@@ -820,7 +820,7 @@ static void __de_get_stats(struct de_private *de)
 
 static struct net_device_stats *de_get_stats(struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         /* The chip only need report frame silently dropped. */
         spin_lock_irq(&de->lock);
@@ -1354,7 +1354,7 @@ static void de_free_rings (struct de_private *de)
 
 static int de_open (struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         int rc;
 
         if (netif_msg_ifup(de))
@@ -1399,7 +1399,7 @@ err_out_free:
 
 static int de_close (struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         unsigned long flags;
 
         if (netif_msg_ifdown(de))
@@ -1422,7 +1422,7 @@ static int de_close (struct net_device *dev)
 
 static void de_tx_timeout (struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         printk(KERN_DEBUG "%s: NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
                dev->name, dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
@@ -1573,7 +1573,7 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)
 
 static void de_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         strcpy (info->driver, DRV_NAME);
         strcpy (info->version, DRV_VERSION);
@@ -1588,7 +1588,7 @@ static int de_get_regs_len(struct net_device *dev)
 
 static int de_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         int rc;
 
         spin_lock_irq(&de->lock);
@@ -1600,7 +1600,7 @@ static int de_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
 static int de_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         int rc;
 
         spin_lock_irq(&de->lock);
@@ -1612,14 +1612,14 @@ static int de_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
 static u32 de_get_msglevel(struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         return de->msg_enable;
 }
 
 static void de_set_msglevel(struct net_device *dev, u32 msglvl)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         de->msg_enable = msglvl;
 }
@@ -1627,7 +1627,7 @@ static void de_set_msglevel(struct net_device *dev, u32 msglvl)
 static int de_get_eeprom(struct net_device *dev,
                          struct ethtool_eeprom *eeprom, u8 *data)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         if (!de->ee_data)
                 return -EOPNOTSUPP;
@@ -1641,7 +1641,7 @@ static int de_get_eeprom(struct net_device *dev,
 
 static int de_nway_reset(struct net_device *dev)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         u32 status;
 
         if (de->media_type != DE_MEDIA_TP_AUTO)
@@ -1660,7 +1660,7 @@ static int de_nway_reset(struct net_device *dev)
 static void de_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                         void *data)
 {
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         regs->version = (DE_REGS_VER << 2) | de->de21040;
 
@@ -1954,7 +1954,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         dev->tx_timeout = de_tx_timeout;
         dev->watchdog_timeo = TX_TIMEOUT;
 
-        de = dev->priv;
+        de = netdev_priv(dev);
         de->de21040 = ent->driver_data == 0 ? 1 : 0;
         de->pdev = pdev;
         de->dev = dev;
@@ -2076,7 +2076,7 @@ err_out_free:
 static void __devexit de_remove_one (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         BUG_ON(!dev);
         unregister_netdev(dev);
@@ -2093,7 +2093,7 @@ static void __devexit de_remove_one (struct pci_dev *pdev)
 static int de_suspend (struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
 
         rtnl_lock();
         if (netif_running (dev)) {
@@ -2128,7 +2128,7 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)
 static int de_resume (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
-        struct de_private *de = dev->priv;
+        struct de_private *de = netdev_priv(dev);
         int retval = 0;
 
         rtnl_lock();
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 0dcced1263b9..391acd32a6a5 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -337,7 +337,7 @@ int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_l
 {
         int i;
         unsigned retval = 0;
-        struct tulip_private *tp = dev->priv;
+        struct tulip_private *tp = netdev_priv(dev);
         void __iomem *ee_addr = tp->base_addr + CSR9;
         int read_cmd = location | (EE_READ_CMD << addr_len);
 
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 35c57f6e630b..00cbc5251dcc 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -890,7 +890,7 @@ static struct net_device_stats * uli526x_get_stats(struct net_device *dev)
 
 static void uli526x_set_filter_mode(struct net_device * dev)
 {
-        struct uli526x_board_info *db = dev->priv;
+        struct uli526x_board_info *db = netdev_priv(dev);
         unsigned long flags;
 
         ULI526X_DBUG(0, "uli526x_set_filter_mode()", 0);