diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:38:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:38:14 -0500 |
commit | 4cf1653aa90c6320dc8032443b5e322820aa28b1 (patch) | |
tree | 7920008d3f953defdcda8c81d39da963290d93ad /drivers/net/plip.c | |
parent | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (diff) |
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>
Diffstat (limited to 'drivers/net/plip.c')
-rw-r--r-- | drivers/net/plip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 2ea78e6b0276..d544d4a086dc 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
@@ -229,7 +229,7 @@ static inline void enable_parport_interrupts (struct net_device *dev) | |||
229 | if (dev->irq != -1) | 229 | if (dev->irq != -1) |
230 | { | 230 | { |
231 | struct parport *port = | 231 | struct parport *port = |
232 | ((struct net_local *)dev->priv)->pardev->port; | 232 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
233 | port->ops->enable_irq (port); | 233 | port->ops->enable_irq (port); |
234 | } | 234 | } |
235 | } | 235 | } |
@@ -239,7 +239,7 @@ static inline void disable_parport_interrupts (struct net_device *dev) | |||
239 | if (dev->irq != -1) | 239 | if (dev->irq != -1) |
240 | { | 240 | { |
241 | struct parport *port = | 241 | struct parport *port = |
242 | ((struct net_local *)dev->priv)->pardev->port; | 242 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
243 | port->ops->disable_irq (port); | 243 | port->ops->disable_irq (port); |
244 | } | 244 | } |
245 | } | 245 | } |
@@ -247,7 +247,7 @@ static inline void disable_parport_interrupts (struct net_device *dev) | |||
247 | static inline void write_data (struct net_device *dev, unsigned char data) | 247 | static inline void write_data (struct net_device *dev, unsigned char data) |
248 | { | 248 | { |
249 | struct parport *port = | 249 | struct parport *port = |
250 | ((struct net_local *)dev->priv)->pardev->port; | 250 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
251 | 251 | ||
252 | port->ops->write_data (port, data); | 252 | port->ops->write_data (port, data); |
253 | } | 253 | } |
@@ -255,7 +255,7 @@ static inline void write_data (struct net_device *dev, unsigned char data) | |||
255 | static inline unsigned char read_status (struct net_device *dev) | 255 | static inline unsigned char read_status (struct net_device *dev) |
256 | { | 256 | { |
257 | struct parport *port = | 257 | struct parport *port = |
258 | ((struct net_local *)dev->priv)->pardev->port; | 258 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
259 | 259 | ||
260 | return port->ops->read_status (port); | 260 | return port->ops->read_status (port); |
261 | } | 261 | } |