diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:37:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:37:49 -0500 |
commit | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (patch) | |
tree | fae8bd1bfb5fd496977a0639ad71c54a2ee278ae /drivers/net/arcnet/com90xx.c | |
parent | 7a12122c7a00347da9669cfcde82954c9e3d6f5e (diff) |
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>
Diffstat (limited to 'drivers/net/arcnet/com90xx.c')
-rw-r--r-- | drivers/net/arcnet/com90xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index 0d45553ff75c..f4113d26587a 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c | |||
@@ -468,7 +468,7 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem | |||
468 | release_mem_region(shmem, MIRROR_SIZE); | 468 | release_mem_region(shmem, MIRROR_SIZE); |
469 | return -ENOMEM; | 469 | return -ENOMEM; |
470 | } | 470 | } |
471 | lp = dev->priv; | 471 | lp = netdev_priv(dev); |
472 | /* find the real shared memory start/end points, including mirrors */ | 472 | /* find the real shared memory start/end points, including mirrors */ |
473 | 473 | ||
474 | /* guess the actual size of one "memory mirror" - the number of | 474 | /* guess the actual size of one "memory mirror" - the number of |
@@ -585,7 +585,7 @@ static void com90xx_setmask(struct net_device *dev, int mask) | |||
585 | */ | 585 | */ |
586 | int com90xx_reset(struct net_device *dev, int really_reset) | 586 | int com90xx_reset(struct net_device *dev, int really_reset) |
587 | { | 587 | { |
588 | struct arcnet_local *lp = dev->priv; | 588 | struct arcnet_local *lp = netdev_priv(dev); |
589 | short ioaddr = dev->base_addr; | 589 | short ioaddr = dev->base_addr; |
590 | 590 | ||
591 | BUGMSG(D_INIT, "Resetting (status=%02Xh)\n", ASTATUS()); | 591 | BUGMSG(D_INIT, "Resetting (status=%02Xh)\n", ASTATUS()); |
@@ -621,7 +621,7 @@ int com90xx_reset(struct net_device *dev, int really_reset) | |||
621 | static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset, | 621 | static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset, |
622 | void *buf, int count) | 622 | void *buf, int count) |
623 | { | 623 | { |
624 | struct arcnet_local *lp = dev->priv; | 624 | struct arcnet_local *lp = netdev_priv(dev); |
625 | void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; | 625 | void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; |
626 | TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count)); | 626 | TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count)); |
627 | } | 627 | } |
@@ -630,7 +630,7 @@ static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset, | |||
630 | static void com90xx_copy_from_card(struct net_device *dev, int bufnum, int offset, | 630 | static void com90xx_copy_from_card(struct net_device *dev, int bufnum, int offset, |
631 | void *buf, int count) | 631 | void *buf, int count) |
632 | { | 632 | { |
633 | struct arcnet_local *lp = dev->priv; | 633 | struct arcnet_local *lp = netdev_priv(dev); |
634 | void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; | 634 | void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; |
635 | TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); | 635 | TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); |
636 | } | 636 | } |
@@ -656,7 +656,7 @@ static void __exit com90xx_exit(void) | |||
656 | 656 | ||
657 | for (count = 0; count < numcards; count++) { | 657 | for (count = 0; count < numcards; count++) { |
658 | dev = cards[count]; | 658 | dev = cards[count]; |
659 | lp = dev->priv; | 659 | lp = netdev_priv(dev); |
660 | 660 | ||
661 | unregister_netdev(dev); | 661 | unregister_netdev(dev); |
662 | free_irq(dev->irq, dev); | 662 | free_irq(dev->irq, dev); |