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>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index e55db660f763..b22d3355fb45 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2130,7 +2130,7 @@ static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie)
 
         for (i = 0; i < 4; i++) {
                 struct net_device *dev = qp->happy_meals[i];
-                struct happy_meal *hp  = dev->priv;
+                struct happy_meal *hp  = netdev_priv(dev);
                 u32 happy_status       = hme_read32(hp, hp->gregs + GREG_STAT);
 
                 HMD(("quattro_interrupt: status=%08x ", happy_status));
@@ -2175,7 +2175,7 @@ static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie)
 
 static int happy_meal_open(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
         int res;
 
         HMD(("happy_meal_open: "));
@@ -2207,7 +2207,7 @@ static int happy_meal_open(struct net_device *dev)
 
 static int happy_meal_close(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         spin_lock_irq(&hp->happy_lock);
         happy_meal_stop(hp, hp->gregs);
@@ -2236,7 +2236,7 @@ static int happy_meal_close(struct net_device *dev)
 
 static void happy_meal_tx_timeout(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         printk (KERN_ERR "%s: transmit timed out, resetting\n", dev->name);
         tx_dump_log();
@@ -2254,7 +2254,7 @@ static void happy_meal_tx_timeout(struct net_device *dev)
 
 static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
         int entry;
         u32 tx_flags;
 
@@ -2343,7 +2343,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *happy_meal_get_stats(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         spin_lock_irq(&hp->happy_lock);
         happy_meal_get_counters(hp, hp->bigmacregs);
@@ -2354,7 +2354,7 @@ static struct net_device_stats *happy_meal_get_stats(struct net_device *dev)
 
 static void happy_meal_set_multicast(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
         void __iomem *bregs = hp->bigmacregs;
         struct dev_mc_list *dmi = dev->mc_list;
         char *addrs;
@@ -2400,7 +2400,7 @@ static void happy_meal_set_multicast(struct net_device *dev)
 /* Ethtool support... */
 static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         cmd->supported =
                 (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
@@ -2445,7 +2445,7 @@ static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 static int hme_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         /* Verify the settings we care about. */
         if (cmd->autoneg != AUTONEG_ENABLE &&
@@ -2469,7 +2469,7 @@ static int hme_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         strcpy(info->driver, "sunhme");
         strcpy(info->version, "2.02");
@@ -2491,7 +2491,7 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
 
 static u32 hme_get_link(struct net_device *dev)
 {
-        struct happy_meal *hp = dev->priv;
+        struct happy_meal *hp = netdev_priv(dev);
 
         spin_lock_irq(&hp->happy_lock);
         hp->sw_bmcr = happy_meal_tcvr_read(hp, hp->tcvregs, MII_BMCR);
@@ -2970,7 +2970,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
 
         dev->base_addr = (long) pdev;
 
-        hp = (struct happy_meal *)dev->priv;
+        hp = netdev_priv(dev);
         memset(hp, 0, sizeof(*hp));
 
         hp->happy_dev = pdev;