diff options
author | Olof Johansson <olof@lixom.net> | 2008-02-05 01:27:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:08 -0500 |
commit | 906da809c5be30b4c7f32bb6a489fb25ad794878 (patch) | |
tree | 9516df9eb1a64ee94d185d2711bde3d1defaabb5 /drivers/net/pcmcia/nmclan_cs.c | |
parent | ecb8a8472f6d314096f20885722f2033d2071719 (diff) |
pcmcia: replace kio_addr_t with unsigned int everywhere
Remove kio_addr_t, and replace it with unsigned int. No known architecture
needs more than 32 bits for IO addresses and ports and having a separate type
for it is just messy.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index a355a93b908b..cfcbea9b7e2e 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -518,7 +518,7 @@ mace_read | |||
518 | assuming that during normal operation, the MACE is always in | 518 | assuming that during normal operation, the MACE is always in |
519 | bank 0. | 519 | bank 0. |
520 | ---------------------------------------------------------------------------- */ | 520 | ---------------------------------------------------------------------------- */ |
521 | static int mace_read(mace_private *lp, kio_addr_t ioaddr, int reg) | 521 | static int mace_read(mace_private *lp, unsigned int ioaddr, int reg) |
522 | { | 522 | { |
523 | int data = 0xFF; | 523 | int data = 0xFF; |
524 | unsigned long flags; | 524 | unsigned long flags; |
@@ -545,7 +545,8 @@ mace_write | |||
545 | are assuming that during normal operation, the MACE is always in | 545 | are assuming that during normal operation, the MACE is always in |
546 | bank 0. | 546 | bank 0. |
547 | ---------------------------------------------------------------------------- */ | 547 | ---------------------------------------------------------------------------- */ |
548 | static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data) | 548 | static void mace_write(mace_private *lp, unsigned int ioaddr, int reg, |
549 | int data) | ||
549 | { | 550 | { |
550 | unsigned long flags; | 551 | unsigned long flags; |
551 | 552 | ||
@@ -567,7 +568,7 @@ static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data) | |||
567 | mace_init | 568 | mace_init |
568 | Resets the MACE chip. | 569 | Resets the MACE chip. |
569 | ---------------------------------------------------------------------------- */ | 570 | ---------------------------------------------------------------------------- */ |
570 | static int mace_init(mace_private *lp, kio_addr_t ioaddr, char *enet_addr) | 571 | static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr) |
571 | { | 572 | { |
572 | int i; | 573 | int i; |
573 | int ct = 0; | 574 | int ct = 0; |
@@ -657,7 +658,7 @@ static int nmclan_config(struct pcmcia_device *link) | |||
657 | tuple_t tuple; | 658 | tuple_t tuple; |
658 | u_char buf[64]; | 659 | u_char buf[64]; |
659 | int i, last_ret, last_fn; | 660 | int i, last_ret, last_fn; |
660 | kio_addr_t ioaddr; | 661 | unsigned int ioaddr; |
661 | DECLARE_MAC_BUF(mac); | 662 | DECLARE_MAC_BUF(mac); |
662 | 663 | ||
663 | DEBUG(0, "nmclan_config(0x%p)\n", link); | 664 | DEBUG(0, "nmclan_config(0x%p)\n", link); |
@@ -839,7 +840,7 @@ mace_open | |||
839 | ---------------------------------------------------------------------------- */ | 840 | ---------------------------------------------------------------------------- */ |
840 | static int mace_open(struct net_device *dev) | 841 | static int mace_open(struct net_device *dev) |
841 | { | 842 | { |
842 | kio_addr_t ioaddr = dev->base_addr; | 843 | unsigned int ioaddr = dev->base_addr; |
843 | mace_private *lp = netdev_priv(dev); | 844 | mace_private *lp = netdev_priv(dev); |
844 | struct pcmcia_device *link = lp->p_dev; | 845 | struct pcmcia_device *link = lp->p_dev; |
845 | 846 | ||
@@ -862,7 +863,7 @@ mace_close | |||
862 | ---------------------------------------------------------------------------- */ | 863 | ---------------------------------------------------------------------------- */ |
863 | static int mace_close(struct net_device *dev) | 864 | static int mace_close(struct net_device *dev) |
864 | { | 865 | { |
865 | kio_addr_t ioaddr = dev->base_addr; | 866 | unsigned int ioaddr = dev->base_addr; |
866 | mace_private *lp = netdev_priv(dev); | 867 | mace_private *lp = netdev_priv(dev); |
867 | struct pcmcia_device *link = lp->p_dev; | 868 | struct pcmcia_device *link = lp->p_dev; |
868 | 869 | ||
@@ -935,7 +936,7 @@ static void mace_tx_timeout(struct net_device *dev) | |||
935 | static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) | 936 | static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) |
936 | { | 937 | { |
937 | mace_private *lp = netdev_priv(dev); | 938 | mace_private *lp = netdev_priv(dev); |
938 | kio_addr_t ioaddr = dev->base_addr; | 939 | unsigned int ioaddr = dev->base_addr; |
939 | 940 | ||
940 | netif_stop_queue(dev); | 941 | netif_stop_queue(dev); |
941 | 942 | ||
@@ -996,7 +997,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
996 | { | 997 | { |
997 | struct net_device *dev = (struct net_device *) dev_id; | 998 | struct net_device *dev = (struct net_device *) dev_id; |
998 | mace_private *lp = netdev_priv(dev); | 999 | mace_private *lp = netdev_priv(dev); |
999 | kio_addr_t ioaddr; | 1000 | unsigned int ioaddr; |
1000 | int status; | 1001 | int status; |
1001 | int IntrCnt = MACE_MAX_IR_ITERATIONS; | 1002 | int IntrCnt = MACE_MAX_IR_ITERATIONS; |
1002 | 1003 | ||
@@ -1140,7 +1141,7 @@ mace_rx | |||
1140 | static int mace_rx(struct net_device *dev, unsigned char RxCnt) | 1141 | static int mace_rx(struct net_device *dev, unsigned char RxCnt) |
1141 | { | 1142 | { |
1142 | mace_private *lp = netdev_priv(dev); | 1143 | mace_private *lp = netdev_priv(dev); |
1143 | kio_addr_t ioaddr = dev->base_addr; | 1144 | unsigned int ioaddr = dev->base_addr; |
1144 | unsigned char rx_framecnt; | 1145 | unsigned char rx_framecnt; |
1145 | unsigned short rx_status; | 1146 | unsigned short rx_status; |
1146 | 1147 | ||
@@ -1302,7 +1303,7 @@ update_stats | |||
1302 | card's SRAM fast enough. If this happens, something is | 1303 | card's SRAM fast enough. If this happens, something is |
1303 | seriously wrong with the hardware. | 1304 | seriously wrong with the hardware. |
1304 | ---------------------------------------------------------------------------- */ | 1305 | ---------------------------------------------------------------------------- */ |
1305 | static void update_stats(kio_addr_t ioaddr, struct net_device *dev) | 1306 | static void update_stats(unsigned int ioaddr, struct net_device *dev) |
1306 | { | 1307 | { |
1307 | mace_private *lp = netdev_priv(dev); | 1308 | mace_private *lp = netdev_priv(dev); |
1308 | 1309 | ||
@@ -1448,7 +1449,7 @@ static void restore_multicast_list(struct net_device *dev) | |||
1448 | mace_private *lp = netdev_priv(dev); | 1449 | mace_private *lp = netdev_priv(dev); |
1449 | int num_addrs = lp->multicast_num_addrs; | 1450 | int num_addrs = lp->multicast_num_addrs; |
1450 | int *ladrf = lp->multicast_ladrf; | 1451 | int *ladrf = lp->multicast_ladrf; |
1451 | kio_addr_t ioaddr = dev->base_addr; | 1452 | unsigned int ioaddr = dev->base_addr; |
1452 | int i; | 1453 | int i; |
1453 | 1454 | ||
1454 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", | 1455 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", |
@@ -1540,7 +1541,7 @@ static void set_multicast_list(struct net_device *dev) | |||
1540 | 1541 | ||
1541 | static void restore_multicast_list(struct net_device *dev) | 1542 | static void restore_multicast_list(struct net_device *dev) |
1542 | { | 1543 | { |
1543 | kio_addr_t ioaddr = dev->base_addr; | 1544 | unsigned int ioaddr = dev->base_addr; |
1544 | mace_private *lp = netdev_priv(dev); | 1545 | mace_private *lp = netdev_priv(dev); |
1545 | 1546 | ||
1546 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name, | 1547 | DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name, |