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, 10 insertions, 10 deletions

diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h
index 7db13e4a7ea5..07091dd27e5d 100644
--- a/drivers/net/sonic.h
+++ b/drivers/net/sonic.h
@@ -371,7 +371,7 @@ static inline __u16 sonic_buf_get(void* base, int bitmode,
 static inline void sonic_cda_put(struct net_device* dev, int entry,
                                  int offset, __u16 val)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         sonic_buf_put(lp->cda, lp->dma_bitmode,
                       (entry * SIZEOF_SONIC_CD) + offset, val);
 }
@@ -379,27 +379,27 @@ static inline void sonic_cda_put(struct net_device* dev, int entry,
 static inline __u16 sonic_cda_get(struct net_device* dev, int entry,
                                   int offset)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         return sonic_buf_get(lp->cda, lp->dma_bitmode,
                              (entry * SIZEOF_SONIC_CD) + offset);
 }
 
 static inline void sonic_set_cam_enable(struct net_device* dev, __u16 val)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         sonic_buf_put(lp->cda, lp->dma_bitmode, SONIC_CDA_CAM_ENABLE, val);
 }
 
 static inline __u16 sonic_get_cam_enable(struct net_device* dev)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         return sonic_buf_get(lp->cda, lp->dma_bitmode, SONIC_CDA_CAM_ENABLE);
 }
 
 static inline void sonic_tda_put(struct net_device* dev, int entry,
                                  int offset, __u16 val)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         sonic_buf_put(lp->tda, lp->dma_bitmode,
                       (entry * SIZEOF_SONIC_TD) + offset, val);
 }
@@ -407,7 +407,7 @@ static inline void sonic_tda_put(struct net_device* dev, int entry,
 static inline __u16 sonic_tda_get(struct net_device* dev, int entry,
                                   int offset)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         return sonic_buf_get(lp->tda, lp->dma_bitmode,
                              (entry * SIZEOF_SONIC_TD) + offset);
 }
@@ -415,7 +415,7 @@ static inline __u16 sonic_tda_get(struct net_device* dev, int entry,
 static inline void sonic_rda_put(struct net_device* dev, int entry,
                                  int offset, __u16 val)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         sonic_buf_put(lp->rda, lp->dma_bitmode,
                       (entry * SIZEOF_SONIC_RD) + offset, val);
 }
@@ -423,7 +423,7 @@ static inline void sonic_rda_put(struct net_device* dev, int entry,
 static inline __u16 sonic_rda_get(struct net_device* dev, int entry,
                                   int offset)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         return sonic_buf_get(lp->rda, lp->dma_bitmode,
                              (entry * SIZEOF_SONIC_RD) + offset);
 }
@@ -431,7 +431,7 @@ static inline __u16 sonic_rda_get(struct net_device* dev, int entry,
 static inline void sonic_rra_put(struct net_device* dev, int entry,
                                  int offset, __u16 val)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         sonic_buf_put(lp->rra, lp->dma_bitmode,
                       (entry * SIZEOF_SONIC_RR) + offset, val);
 }
@@ -439,7 +439,7 @@ static inline void sonic_rra_put(struct net_device* dev, int entry,
 static inline __u16 sonic_rra_get(struct net_device* dev, int entry,
                                   int offset)
 {
-        struct sonic_local* lp = (struct sonic_local *) dev->priv;
+        struct sonic_local *lp = netdev_priv(dev);
         return sonic_buf_get(lp->rra, lp->dma_bitmode,
                              (entry * SIZEOF_SONIC_RR) + offset);
 }