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/fmvj18x_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/fmvj18x_cs.c')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 949c6df74c97..7cb22531082d 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -298,7 +298,8 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | |||
298 | static int mfc_try_io_port(struct pcmcia_device *link) | 298 | static int mfc_try_io_port(struct pcmcia_device *link) |
299 | { | 299 | { |
300 | int i, ret; | 300 | int i, ret; |
301 | static const kio_addr_t serial_base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 301 | static const unsigned int serial_base[5] = |
302 | { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | ||
302 | 303 | ||
303 | for (i = 0; i < 5; i++) { | 304 | for (i = 0; i < 5; i++) { |
304 | link->io.BasePort2 = serial_base[i]; | 305 | link->io.BasePort2 = serial_base[i]; |
@@ -316,7 +317,7 @@ static int mfc_try_io_port(struct pcmcia_device *link) | |||
316 | static int ungermann_try_io_port(struct pcmcia_device *link) | 317 | static int ungermann_try_io_port(struct pcmcia_device *link) |
317 | { | 318 | { |
318 | int ret; | 319 | int ret; |
319 | kio_addr_t ioaddr; | 320 | unsigned int ioaddr; |
320 | /* | 321 | /* |
321 | Ungermann-Bass Access/CARD accepts 0x300,0x320,0x340,0x360 | 322 | Ungermann-Bass Access/CARD accepts 0x300,0x320,0x340,0x360 |
322 | 0x380,0x3c0 only for ioport. | 323 | 0x380,0x3c0 only for ioport. |
@@ -342,7 +343,7 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
342 | cisparse_t parse; | 343 | cisparse_t parse; |
343 | u_short buf[32]; | 344 | u_short buf[32]; |
344 | int i, last_fn = 0, last_ret = 0, ret; | 345 | int i, last_fn = 0, last_ret = 0, ret; |
345 | kio_addr_t ioaddr; | 346 | unsigned int ioaddr; |
346 | cardtype_t cardtype; | 347 | cardtype_t cardtype; |
347 | char *card_name = "unknown"; | 348 | char *card_name = "unknown"; |
348 | u_char *node_id; | 349 | u_char *node_id; |
@@ -610,7 +611,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) | |||
610 | u_char __iomem *base; | 611 | u_char __iomem *base; |
611 | int i, j; | 612 | int i, j; |
612 | struct net_device *dev = link->priv; | 613 | struct net_device *dev = link->priv; |
613 | kio_addr_t ioaddr; | 614 | unsigned int ioaddr; |
614 | 615 | ||
615 | /* Allocate a small memory window */ | 616 | /* Allocate a small memory window */ |
616 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 617 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
@@ -735,7 +736,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id) | |||
735 | { | 736 | { |
736 | struct net_device *dev = dev_id; | 737 | struct net_device *dev = dev_id; |
737 | local_info_t *lp = netdev_priv(dev); | 738 | local_info_t *lp = netdev_priv(dev); |
738 | kio_addr_t ioaddr; | 739 | unsigned int ioaddr; |
739 | unsigned short tx_stat, rx_stat; | 740 | unsigned short tx_stat, rx_stat; |
740 | 741 | ||
741 | ioaddr = dev->base_addr; | 742 | ioaddr = dev->base_addr; |
@@ -789,7 +790,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id) | |||
789 | static void fjn_tx_timeout(struct net_device *dev) | 790 | static void fjn_tx_timeout(struct net_device *dev) |
790 | { | 791 | { |
791 | struct local_info_t *lp = netdev_priv(dev); | 792 | struct local_info_t *lp = netdev_priv(dev); |
792 | kio_addr_t ioaddr = dev->base_addr; | 793 | unsigned int ioaddr = dev->base_addr; |
793 | 794 | ||
794 | printk(KERN_NOTICE "%s: transmit timed out with status %04x, %s?\n", | 795 | printk(KERN_NOTICE "%s: transmit timed out with status %04x, %s?\n", |
795 | dev->name, htons(inw(ioaddr + TX_STATUS)), | 796 | dev->name, htons(inw(ioaddr + TX_STATUS)), |
@@ -819,7 +820,7 @@ static void fjn_tx_timeout(struct net_device *dev) | |||
819 | static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) | 820 | static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) |
820 | { | 821 | { |
821 | struct local_info_t *lp = netdev_priv(dev); | 822 | struct local_info_t *lp = netdev_priv(dev); |
822 | kio_addr_t ioaddr = dev->base_addr; | 823 | unsigned int ioaddr = dev->base_addr; |
823 | short length = skb->len; | 824 | short length = skb->len; |
824 | 825 | ||
825 | if (length < ETH_ZLEN) | 826 | if (length < ETH_ZLEN) |
@@ -892,7 +893,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
892 | static void fjn_reset(struct net_device *dev) | 893 | static void fjn_reset(struct net_device *dev) |
893 | { | 894 | { |
894 | struct local_info_t *lp = netdev_priv(dev); | 895 | struct local_info_t *lp = netdev_priv(dev); |
895 | kio_addr_t ioaddr = dev->base_addr; | 896 | unsigned int ioaddr = dev->base_addr; |
896 | int i; | 897 | int i; |
897 | 898 | ||
898 | DEBUG(4, "fjn_reset(%s) called.\n",dev->name); | 899 | DEBUG(4, "fjn_reset(%s) called.\n",dev->name); |
@@ -971,7 +972,7 @@ static void fjn_reset(struct net_device *dev) | |||
971 | static void fjn_rx(struct net_device *dev) | 972 | static void fjn_rx(struct net_device *dev) |
972 | { | 973 | { |
973 | struct local_info_t *lp = netdev_priv(dev); | 974 | struct local_info_t *lp = netdev_priv(dev); |
974 | kio_addr_t ioaddr = dev->base_addr; | 975 | unsigned int ioaddr = dev->base_addr; |
975 | int boguscount = 10; /* 5 -> 10: by agy 19940922 */ | 976 | int boguscount = 10; /* 5 -> 10: by agy 19940922 */ |
976 | 977 | ||
977 | DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n", | 978 | DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n", |
@@ -1125,7 +1126,7 @@ static int fjn_close(struct net_device *dev) | |||
1125 | { | 1126 | { |
1126 | struct local_info_t *lp = netdev_priv(dev); | 1127 | struct local_info_t *lp = netdev_priv(dev); |
1127 | struct pcmcia_device *link = lp->p_dev; | 1128 | struct pcmcia_device *link = lp->p_dev; |
1128 | kio_addr_t ioaddr = dev->base_addr; | 1129 | unsigned int ioaddr = dev->base_addr; |
1129 | 1130 | ||
1130 | DEBUG(4, "fjn_close('%s').\n", dev->name); | 1131 | DEBUG(4, "fjn_close('%s').\n", dev->name); |
1131 | 1132 | ||
@@ -1168,7 +1169,7 @@ static struct net_device_stats *fjn_get_stats(struct net_device *dev) | |||
1168 | 1169 | ||
1169 | static void set_rx_mode(struct net_device *dev) | 1170 | static void set_rx_mode(struct net_device *dev) |
1170 | { | 1171 | { |
1171 | kio_addr_t ioaddr = dev->base_addr; | 1172 | unsigned int ioaddr = dev->base_addr; |
1172 | u_char mc_filter[8]; /* Multicast hash filter */ | 1173 | u_char mc_filter[8]; /* Multicast hash filter */ |
1173 | u_long flags; | 1174 | u_long flags; |
1174 | int i; | 1175 | int i; |