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/ni52.c b/drivers/net/ni52.c
index 6d7cf3c90fbd..10cfd0f91fc0 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -214,7 +214,7 @@ struct priv {
 /* wait for command with timeout: */
 static void wait_for_scb_cmd(struct net_device *dev)
 {
-        struct priv *p = dev->priv;
+        struct priv *p = netdev_priv(dev);
         int i;
         for (i = 0; i < 16384; i++) {
                 if (readb(&p->scb->cmd_cuc) == 0)
@@ -233,7 +233,7 @@ static void wait_for_scb_cmd(struct net_device *dev)
 
 static void wait_for_scb_cmd_ruc(struct net_device *dev)
 {
-        struct priv *p = dev->priv;
+        struct priv *p = netdev_priv(dev);
         int i;
         for (i = 0; i < 16384; i++) {
                 if (readb(&p->scb->cmd_ruc) == 0)
@@ -298,7 +298,7 @@ static int ni52_open(struct net_device *dev)
 static int check_iscp(struct net_device *dev, void __iomem *addr)
 {
         struct iscp_struct __iomem *iscp = addr;
-        struct priv *p = dev->priv;
+        struct priv *p = netdev_priv(dev);
         memset_io(iscp, 0, sizeof(struct iscp_struct));
 
         writel(make24(iscp), &p->scp->iscp);
@@ -318,7 +318,7 @@ static int check_iscp(struct net_device *dev, void __iomem *addr)
  */
 static int check586(struct net_device *dev, unsigned size)
 {
-        struct priv *p = dev->priv;
+        struct priv *p = netdev_priv(dev);
         int i;
 
         p->mapped = ioremap(dev->mem_start, size);
@@ -354,7 +354,7 @@ Enodev:
  */
 static void alloc586(struct net_device *dev)
 {
-        struct priv *p =        (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         ni_reset586();
         mdelay(32);
@@ -400,7 +400,7 @@ struct net_device * __init ni52_probe(int unit)
         if (!dev)
                 return ERR_PTR(-ENOMEM);
 
-        p = dev->priv;
+        p = netdev_priv(dev);
 
         if (unit >= 0) {
                 sprintf(dev->name, "eth%d", unit);
@@ -446,7 +446,7 @@ out:
 static int __init ni52_probe1(struct net_device *dev, int ioaddr)
 {
         int i, size, retval;
-        struct priv *priv = dev->priv;
+        struct priv *priv = netdev_priv(dev);
 
         dev->base_addr = ioaddr;
         dev->irq = irq;
@@ -588,7 +588,7 @@ static int init586(struct net_device *dev)
 {
         void __iomem *ptr;
         int i, result = 0;
-        struct priv *p = (struct priv *)dev->priv;
+        struct priv *p = netdev_priv(dev);
         struct configure_cmd_struct __iomem *cfg_cmd;
         struct iasetup_cmd_struct __iomem *ias_cmd;
         struct tdr_cmd_struct __iomem *tdr_cmd;
@@ -829,7 +829,7 @@ static void __iomem *alloc_rfa(struct net_device *dev, void __iomem *ptr)
         struct rfd_struct __iomem *rfd = ptr;
         struct rbd_struct __iomem *rbd;
         int i;
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         memset_io(rfd, 0,
                 sizeof(struct rfd_struct) * (p->num_recv_buffs + rfdadd));
@@ -878,7 +878,7 @@ static irqreturn_t ni52_interrupt(int irq, void *dev_id)
         int cnt = 0;
         struct priv *p;
 
-        p = (struct priv *) dev->priv;
+        p = netdev_priv(dev);
 
         if (debuglevel > 1)
                 printk("I");
@@ -950,7 +950,7 @@ static void ni52_rcv_int(struct net_device *dev)
         unsigned short totlen;
         struct sk_buff *skb;
         struct rbd_struct __iomem *rbd;
-        struct priv *p = (struct priv *)dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         if (debuglevel > 0)
                 printk("R");
@@ -1039,7 +1039,7 @@ static void ni52_rcv_int(struct net_device *dev)
 
 static void ni52_rnr_int(struct net_device *dev)
 {
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         p->stats.rx_errors++;
 
@@ -1064,7 +1064,7 @@ static void ni52_rnr_int(struct net_device *dev)
 static void ni52_xmt_int(struct net_device *dev)
 {
         int status;
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         if (debuglevel > 0)
                 printk("X");
@@ -1112,7 +1112,7 @@ static void ni52_xmt_int(struct net_device *dev)
 
 static void startrecv586(struct net_device *dev)
 {
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         wait_for_scb_cmd(dev);
         wait_for_scb_cmd_ruc(dev);
@@ -1125,7 +1125,7 @@ static void startrecv586(struct net_device *dev)
 
 static void ni52_timeout(struct net_device *dev)
 {
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 #ifndef NO_NOPCOMMANDS
         if (readb(&p->scb->cus) & CU_ACTIVE) { /* COMMAND-UNIT active? */
                 netif_wake_queue(dev);
@@ -1176,7 +1176,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 #ifndef NO_NOPCOMMANDS
         int next_nop;
 #endif
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
 
         if (skb->len > XMIT_BUFF_SIZE) {
                 printk(KERN_ERR "%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n", dev->name, XMIT_BUFF_SIZE, skb->len);
@@ -1273,7 +1273,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *ni52_get_stats(struct net_device *dev)
 {
-        struct priv *p = (struct priv *) dev->priv;
+        struct priv *p = netdev_priv(dev);
         unsigned short crc, aln, rsc, ovrn;
 
         /* Get error-statistics from the ni82586 */
@@ -1336,7 +1336,7 @@ int __init init_module(void)
 
 void __exit cleanup_module(void)
 {
-        struct priv *p = dev_ni52->priv;
+        struct priv *p = netdev_priv(dev_ni52);
         unregister_netdev(dev_ni52);
         iounmap(p->mapped);
         release_region(dev_ni52->base_addr, NI52_TOTAL_SIZE);