diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:38:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:38:36 -0500 |
commit | 8f15ea42b64941001a401cf855a0869e24f3a845 (patch) | |
tree | 27c7534ad70ebda6986491daeac0ebe0f1ca54ed /drivers/net/smc9194.c | |
parent | 4cf1653aa90c6320dc8032443b5e322820aa28b1 (diff) |
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>
Diffstat (limited to 'drivers/net/smc9194.c')
-rw-r--r-- | drivers/net/smc9194.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index e35fab1da6a4..e7cc80f32560 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -1034,7 +1034,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
1034 | printk("ADDR: %pM\n", dev->dev_addr); | 1034 | printk("ADDR: %pM\n", dev->dev_addr); |
1035 | 1035 | ||
1036 | /* set the private data to zero by default */ | 1036 | /* set the private data to zero by default */ |
1037 | memset(dev->priv, 0, sizeof(struct smc_local)); | 1037 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); |
1038 | 1038 | ||
1039 | /* Grab the IRQ */ | 1039 | /* Grab the IRQ */ |
1040 | retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev); | 1040 | retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev); |
@@ -1108,7 +1108,7 @@ static int smc_open(struct net_device *dev) | |||
1108 | int i; /* used to set hw ethernet address */ | 1108 | int i; /* used to set hw ethernet address */ |
1109 | 1109 | ||
1110 | /* clear out all the junk that was put here before... */ | 1110 | /* clear out all the junk that was put here before... */ |
1111 | memset(dev->priv, 0, sizeof(struct smc_local)); | 1111 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); |
1112 | 1112 | ||
1113 | /* reset the hardware */ | 1113 | /* reset the hardware */ |
1114 | 1114 | ||
@@ -1164,7 +1164,7 @@ static void smc_timeout(struct net_device *dev) | |||
1164 | smc_enable( dev->base_addr ); | 1164 | smc_enable( dev->base_addr ); |
1165 | dev->trans_start = jiffies; | 1165 | dev->trans_start = jiffies; |
1166 | /* clear anything saved */ | 1166 | /* clear anything saved */ |
1167 | ((struct smc_local *)dev->priv)->saved_skb = NULL; | 1167 | ((struct smc_local *)netdev_priv(dev))->saved_skb = NULL; |
1168 | netif_wake_queue(dev); | 1168 | netif_wake_queue(dev); |
1169 | } | 1169 | } |
1170 | 1170 | ||