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

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

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index d6b0036abafa..4d1a059921c6 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -390,7 +390,7 @@ i596_timeout(struct net_device *dev, char *msg, int ct) {
         struct i596_private *lp;
         int boguscnt = ct;
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         while (lp->scb.command) {
                 if (--boguscnt == 0) {
                         printk("%s: %s timed out - stat %4.4x, cmd %4.4x\n",
@@ -411,7 +411,7 @@ init_rx_bufs(struct net_device *dev, int num) {
         int i;
         // struct i596_rbd *rbd;
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         lp->scb.pa_rfd = I596_NULL;
 
         for (i = 0; i < num; i++) {
@@ -468,7 +468,7 @@ remove_rx_bufs(struct net_device *dev) {
         struct i596_private *lp;
         struct i596_rfd *rfd;
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         lp->rx_tail->pa_next = I596_NULL;
 
         do {
@@ -517,7 +517,7 @@ CLEAR_INT(void) {
 /* selftest or dump */
 static void
 i596_port_do(struct net_device *dev, int portcmd, char *cmdname) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         u16 *outp;
         int i, m;
 
@@ -541,7 +541,7 @@ i596_port_do(struct net_device *dev, int portcmd, char *cmdname) {
 
 static int
 i596_scp_setup(struct net_device *dev) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         int boguscnt;
 
         /* Setup SCP, ISCP, SCB */
@@ -622,7 +622,7 @@ init_i596(struct net_device *dev) {
         if (i596_scp_setup(dev))
                 return 1;
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         lp->scb.command = 0;
 
         memcpy ((void *)lp->i596_config, init_setup, 14);
@@ -704,7 +704,7 @@ i596_rx_one(struct net_device *dev, struct i596_private *lp,
 
 static int
 i596_rx(struct net_device *dev) {
-        struct i596_private *lp = (struct i596_private *) dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         struct i596_rfd *rfd;
         int frames = 0;
 
@@ -737,7 +737,7 @@ i596_cleanup_cmd(struct net_device *dev) {
         struct i596_private *lp;
         struct i596_cmd *cmd;
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         while (lp->cmd_head) {
                 cmd = (struct i596_cmd *)lp->cmd_head;
 
@@ -805,7 +805,7 @@ static void i596_reset(struct net_device *dev, struct i596_private *lp, int ioad
 }
 
 static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         int ioaddr = dev->base_addr;
         unsigned long flags;
 
@@ -911,7 +911,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 
 static void
 i596_tx_timeout (struct net_device *dev) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         int ioaddr = dev->base_addr;
 
         /* Transmitter timeout, serious problems. */
@@ -969,7 +969,7 @@ static int __init lp486e_probe(struct net_device *dev) {
                 return -EBUSY;
         }
 
-        lp = (struct i596_private *) dev->priv;
+        lp = netdev_priv(dev);
         spin_lock_init(&lp->cmd_lock);
 
         /*
@@ -1146,7 +1146,7 @@ static irqreturn_t
 i596_interrupt(int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         unsigned short status, ack_cmd = 0;
         int frames_in = 0;
 
@@ -1214,7 +1214,7 @@ i596_interrupt(int irq, void *dev_instance)
 }
 
 static int i596_close(struct net_device *dev) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
 
         netif_stop_queue(dev);
 
@@ -1241,7 +1241,7 @@ static int i596_close(struct net_device *dev) {
 */
 
 static void set_multicast_list(struct net_device *dev) {
-        struct i596_private *lp = dev->priv;
+        struct i596_private *lp = netdev_priv(dev);
         struct i596_cmd *cmd;
 
         if (i596_debug > 1)