aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c49
-rw-r--r--drivers/net/pcmcia/3c589_cs.c30
-rw-r--r--drivers/net/pcmcia/axnet_cs.c26
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c23
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c25
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c36
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c62
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c51
8 files changed, 153 insertions, 149 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 36a7ba3134ce..dafbbdbc4bf7 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -230,10 +230,11 @@ static char mii_preamble_required = 0;
230static int tc574_config(struct pcmcia_device *link); 230static int tc574_config(struct pcmcia_device *link);
231static void tc574_release(struct pcmcia_device *link); 231static void tc574_release(struct pcmcia_device *link);
232 232
233static void mdio_sync(kio_addr_t ioaddr, int bits); 233static void mdio_sync(unsigned int ioaddr, int bits);
234static int mdio_read(kio_addr_t ioaddr, int phy_id, int location); 234static int mdio_read(unsigned int ioaddr, int phy_id, int location);
235static void mdio_write(kio_addr_t ioaddr, int phy_id, int location, int value); 235static void mdio_write(unsigned int ioaddr, int phy_id, int location,
236static unsigned short read_eeprom(kio_addr_t ioaddr, int index); 236 int value);
237static unsigned short read_eeprom(unsigned int ioaddr, int index);
237static void tc574_wait_for_completion(struct net_device *dev, int cmd); 238static void tc574_wait_for_completion(struct net_device *dev, int cmd);
238 239
239static void tc574_reset(struct net_device *dev); 240static void tc574_reset(struct net_device *dev);
@@ -341,7 +342,7 @@ static int tc574_config(struct pcmcia_device *link)
341 tuple_t tuple; 342 tuple_t tuple;
342 __le16 buf[32]; 343 __le16 buf[32];
343 int last_fn, last_ret, i, j; 344 int last_fn, last_ret, i, j;
344 kio_addr_t ioaddr; 345 unsigned int ioaddr;
345 __be16 *phys_addr; 346 __be16 *phys_addr;
346 char *cardname; 347 char *cardname;
347 __u32 config; 348 __u32 config;
@@ -515,7 +516,7 @@ static int tc574_resume(struct pcmcia_device *link)
515 516
516static void dump_status(struct net_device *dev) 517static void dump_status(struct net_device *dev)
517{ 518{
518 kio_addr_t ioaddr = dev->base_addr; 519 unsigned int ioaddr = dev->base_addr;
519 EL3WINDOW(1); 520 EL3WINDOW(1);
520 printk(KERN_INFO " irq status %04x, rx status %04x, tx status " 521 printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
521 "%02x, tx free %04x\n", inw(ioaddr+EL3_STATUS), 522 "%02x, tx free %04x\n", inw(ioaddr+EL3_STATUS),
@@ -544,7 +545,7 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd)
544/* Read a word from the EEPROM using the regular EEPROM access register. 545/* Read a word from the EEPROM using the regular EEPROM access register.
545 Assume that we are in register window zero. 546 Assume that we are in register window zero.
546 */ 547 */
547static unsigned short read_eeprom(kio_addr_t ioaddr, int index) 548static unsigned short read_eeprom(unsigned int ioaddr, int index)
548{ 549{
549 int timer; 550 int timer;
550 outw(EEPROM_Read + index, ioaddr + Wn0EepromCmd); 551 outw(EEPROM_Read + index, ioaddr + Wn0EepromCmd);
@@ -572,9 +573,9 @@ static unsigned short read_eeprom(kio_addr_t ioaddr, int index)
572 573
573/* Generate the preamble required for initial synchronization and 574/* Generate the preamble required for initial synchronization and
574 a few older transceivers. */ 575 a few older transceivers. */
575static void mdio_sync(kio_addr_t ioaddr, int bits) 576static void mdio_sync(unsigned int ioaddr, int bits)
576{ 577{
577 kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; 578 unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
578 579
579 /* Establish sync by sending at least 32 logic ones. */ 580 /* Establish sync by sending at least 32 logic ones. */
580 while (-- bits >= 0) { 581 while (-- bits >= 0) {
@@ -583,12 +584,12 @@ static void mdio_sync(kio_addr_t ioaddr, int bits)
583 } 584 }
584} 585}
585 586
586static int mdio_read(kio_addr_t ioaddr, int phy_id, int location) 587static int mdio_read(unsigned int ioaddr, int phy_id, int location)
587{ 588{
588 int i; 589 int i;
589 int read_cmd = (0xf6 << 10) | (phy_id << 5) | location; 590 int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
590 unsigned int retval = 0; 591 unsigned int retval = 0;
591 kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; 592 unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
592 593
593 if (mii_preamble_required) 594 if (mii_preamble_required)
594 mdio_sync(ioaddr, 32); 595 mdio_sync(ioaddr, 32);
@@ -608,10 +609,10 @@ static int mdio_read(kio_addr_t ioaddr, int phy_id, int location)
608 return (retval>>1) & 0xffff; 609 return (retval>>1) & 0xffff;
609} 610}
610 611
611static void mdio_write(kio_addr_t ioaddr, int phy_id, int location, int value) 612static void mdio_write(unsigned int ioaddr, int phy_id, int location, int value)
612{ 613{
613 int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value; 614 int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value;
614 kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; 615 unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
615 int i; 616 int i;
616 617
617 if (mii_preamble_required) 618 if (mii_preamble_required)
@@ -637,7 +638,7 @@ static void tc574_reset(struct net_device *dev)
637{ 638{
638 struct el3_private *lp = netdev_priv(dev); 639 struct el3_private *lp = netdev_priv(dev);
639 int i; 640 int i;
640 kio_addr_t ioaddr = dev->base_addr; 641 unsigned int ioaddr = dev->base_addr;
641 unsigned long flags; 642 unsigned long flags;
642 643
643 tc574_wait_for_completion(dev, TotalReset|0x10); 644 tc574_wait_for_completion(dev, TotalReset|0x10);
@@ -741,7 +742,7 @@ static int el3_open(struct net_device *dev)
741static void el3_tx_timeout(struct net_device *dev) 742static void el3_tx_timeout(struct net_device *dev)
742{ 743{
743 struct el3_private *lp = netdev_priv(dev); 744 struct el3_private *lp = netdev_priv(dev);
744 kio_addr_t ioaddr = dev->base_addr; 745 unsigned int ioaddr = dev->base_addr;
745 746
746 printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name); 747 printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name);
747 dump_status(dev); 748 dump_status(dev);
@@ -756,7 +757,7 @@ static void el3_tx_timeout(struct net_device *dev)
756static void pop_tx_status(struct net_device *dev) 757static void pop_tx_status(struct net_device *dev)
757{ 758{
758 struct el3_private *lp = netdev_priv(dev); 759 struct el3_private *lp = netdev_priv(dev);
759 kio_addr_t ioaddr = dev->base_addr; 760 unsigned int ioaddr = dev->base_addr;
760 int i; 761 int i;
761 762
762 /* Clear the Tx status stack. */ 763 /* Clear the Tx status stack. */
@@ -779,7 +780,7 @@ static void pop_tx_status(struct net_device *dev)
779 780
780static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) 781static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
781{ 782{
782 kio_addr_t ioaddr = dev->base_addr; 783 unsigned int ioaddr = dev->base_addr;
783 struct el3_private *lp = netdev_priv(dev); 784 struct el3_private *lp = netdev_priv(dev);
784 unsigned long flags; 785 unsigned long flags;
785 786
@@ -813,7 +814,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
813{ 814{
814 struct net_device *dev = (struct net_device *) dev_id; 815 struct net_device *dev = (struct net_device *) dev_id;
815 struct el3_private *lp = netdev_priv(dev); 816 struct el3_private *lp = netdev_priv(dev);
816 kio_addr_t ioaddr; 817 unsigned int ioaddr;
817 unsigned status; 818 unsigned status;
818 int work_budget = max_interrupt_work; 819 int work_budget = max_interrupt_work;
819 int handled = 0; 820 int handled = 0;
@@ -907,7 +908,7 @@ static void media_check(unsigned long arg)
907{ 908{
908 struct net_device *dev = (struct net_device *) arg; 909 struct net_device *dev = (struct net_device *) arg;
909 struct el3_private *lp = netdev_priv(dev); 910 struct el3_private *lp = netdev_priv(dev);
910 kio_addr_t ioaddr = dev->base_addr; 911 unsigned int ioaddr = dev->base_addr;
911 unsigned long flags; 912 unsigned long flags;
912 unsigned short /* cable, */ media, partner; 913 unsigned short /* cable, */ media, partner;
913 914
@@ -996,7 +997,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
996static void update_stats(struct net_device *dev) 997static void update_stats(struct net_device *dev)
997{ 998{
998 struct el3_private *lp = netdev_priv(dev); 999 struct el3_private *lp = netdev_priv(dev);
999 kio_addr_t ioaddr = dev->base_addr; 1000 unsigned int ioaddr = dev->base_addr;
1000 u8 rx, tx, up; 1001 u8 rx, tx, up;
1001 1002
1002 DEBUG(2, "%s: updating the statistics.\n", dev->name); 1003 DEBUG(2, "%s: updating the statistics.\n", dev->name);
@@ -1033,7 +1034,7 @@ static void update_stats(struct net_device *dev)
1033static int el3_rx(struct net_device *dev, int worklimit) 1034static int el3_rx(struct net_device *dev, int worklimit)
1034{ 1035{
1035 struct el3_private *lp = netdev_priv(dev); 1036 struct el3_private *lp = netdev_priv(dev);
1036 kio_addr_t ioaddr = dev->base_addr; 1037 unsigned int ioaddr = dev->base_addr;
1037 short rx_status; 1038 short rx_status;
1038 1039
1039 DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", 1040 DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n",
@@ -1094,7 +1095,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
1094static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 1095static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1095{ 1096{
1096 struct el3_private *lp = netdev_priv(dev); 1097 struct el3_private *lp = netdev_priv(dev);
1097 kio_addr_t ioaddr = dev->base_addr; 1098 unsigned int ioaddr = dev->base_addr;
1098 u16 *data = (u16 *)&rq->ifr_ifru; 1099 u16 *data = (u16 *)&rq->ifr_ifru;
1099 int phy = lp->phys & 0x1f; 1100 int phy = lp->phys & 0x1f;
1100 1101
@@ -1148,7 +1149,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1148 1149
1149static void set_rx_mode(struct net_device *dev) 1150static void set_rx_mode(struct net_device *dev)
1150{ 1151{
1151 kio_addr_t ioaddr = dev->base_addr; 1152 unsigned int ioaddr = dev->base_addr;
1152 1153
1153 if (dev->flags & IFF_PROMISC) 1154 if (dev->flags & IFF_PROMISC)
1154 outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm, 1155 outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm,
@@ -1161,7 +1162,7 @@ static void set_rx_mode(struct net_device *dev)
1161 1162
1162static int el3_close(struct net_device *dev) 1163static int el3_close(struct net_device *dev)
1163{ 1164{
1164 kio_addr_t ioaddr = dev->base_addr; 1165 unsigned int ioaddr = dev->base_addr;
1165 struct el3_private *lp = netdev_priv(dev); 1166 struct el3_private *lp = netdev_priv(dev);
1166 struct pcmcia_device *link = lp->p_dev; 1167 struct pcmcia_device *link = lp->p_dev;
1167 1168
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index e862d14ece79..1b1abb19c911 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -145,7 +145,7 @@ DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)";
145static int tc589_config(struct pcmcia_device *link); 145static int tc589_config(struct pcmcia_device *link);
146static void tc589_release(struct pcmcia_device *link); 146static void tc589_release(struct pcmcia_device *link);
147 147
148static u16 read_eeprom(kio_addr_t ioaddr, int index); 148static u16 read_eeprom(unsigned int ioaddr, int index);
149static void tc589_reset(struct net_device *dev); 149static void tc589_reset(struct net_device *dev);
150static void media_check(unsigned long arg); 150static void media_check(unsigned long arg);
151static int el3_config(struct net_device *dev, struct ifmap *map); 151static int el3_config(struct net_device *dev, struct ifmap *map);
@@ -254,7 +254,7 @@ static int tc589_config(struct pcmcia_device *link)
254 __le16 buf[32]; 254 __le16 buf[32];
255 __be16 *phys_addr; 255 __be16 *phys_addr;
256 int last_fn, last_ret, i, j, multi = 0, fifo; 256 int last_fn, last_ret, i, j, multi = 0, fifo;
257 kio_addr_t ioaddr; 257 unsigned int ioaddr;
258 char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; 258 char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
259 DECLARE_MAC_BUF(mac); 259 DECLARE_MAC_BUF(mac);
260 260
@@ -403,7 +403,7 @@ static void tc589_wait_for_completion(struct net_device *dev, int cmd)
403 Read a word from the EEPROM using the regular EEPROM access register. 403 Read a word from the EEPROM using the regular EEPROM access register.
404 Assume that we are in register window zero. 404 Assume that we are in register window zero.
405*/ 405*/
406static u16 read_eeprom(kio_addr_t ioaddr, int index) 406static u16 read_eeprom(unsigned int ioaddr, int index)
407{ 407{
408 int i; 408 int i;
409 outw(EEPROM_READ + index, ioaddr + 10); 409 outw(EEPROM_READ + index, ioaddr + 10);
@@ -421,7 +421,7 @@ static u16 read_eeprom(kio_addr_t ioaddr, int index)
421static void tc589_set_xcvr(struct net_device *dev, int if_port) 421static void tc589_set_xcvr(struct net_device *dev, int if_port)
422{ 422{
423 struct el3_private *lp = netdev_priv(dev); 423 struct el3_private *lp = netdev_priv(dev);
424 kio_addr_t ioaddr = dev->base_addr; 424 unsigned int ioaddr = dev->base_addr;
425 425
426 EL3WINDOW(0); 426 EL3WINDOW(0);
427 switch (if_port) { 427 switch (if_port) {
@@ -443,7 +443,7 @@ static void tc589_set_xcvr(struct net_device *dev, int if_port)
443 443
444static void dump_status(struct net_device *dev) 444static void dump_status(struct net_device *dev)
445{ 445{
446 kio_addr_t ioaddr = dev->base_addr; 446 unsigned int ioaddr = dev->base_addr;
447 EL3WINDOW(1); 447 EL3WINDOW(1);
448 printk(KERN_INFO " irq status %04x, rx status %04x, tx status " 448 printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
449 "%02x tx free %04x\n", inw(ioaddr+EL3_STATUS), 449 "%02x tx free %04x\n", inw(ioaddr+EL3_STATUS),
@@ -459,7 +459,7 @@ static void dump_status(struct net_device *dev)
459/* Reset and restore all of the 3c589 registers. */ 459/* Reset and restore all of the 3c589 registers. */
460static void tc589_reset(struct net_device *dev) 460static void tc589_reset(struct net_device *dev)
461{ 461{
462 kio_addr_t ioaddr = dev->base_addr; 462 unsigned int ioaddr = dev->base_addr;
463 int i; 463 int i;
464 464
465 EL3WINDOW(0); 465 EL3WINDOW(0);
@@ -567,7 +567,7 @@ static int el3_open(struct net_device *dev)
567static void el3_tx_timeout(struct net_device *dev) 567static void el3_tx_timeout(struct net_device *dev)
568{ 568{
569 struct el3_private *lp = netdev_priv(dev); 569 struct el3_private *lp = netdev_priv(dev);
570 kio_addr_t ioaddr = dev->base_addr; 570 unsigned int ioaddr = dev->base_addr;
571 571
572 printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name); 572 printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name);
573 dump_status(dev); 573 dump_status(dev);
@@ -582,7 +582,7 @@ static void el3_tx_timeout(struct net_device *dev)
582static void pop_tx_status(struct net_device *dev) 582static void pop_tx_status(struct net_device *dev)
583{ 583{
584 struct el3_private *lp = netdev_priv(dev); 584 struct el3_private *lp = netdev_priv(dev);
585 kio_addr_t ioaddr = dev->base_addr; 585 unsigned int ioaddr = dev->base_addr;
586 int i; 586 int i;
587 587
588 /* Clear the Tx status stack. */ 588 /* Clear the Tx status stack. */
@@ -604,7 +604,7 @@ static void pop_tx_status(struct net_device *dev)
604 604
605static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) 605static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
606{ 606{
607 kio_addr_t ioaddr = dev->base_addr; 607 unsigned int ioaddr = dev->base_addr;
608 struct el3_private *priv = netdev_priv(dev); 608 struct el3_private *priv = netdev_priv(dev);
609 unsigned long flags; 609 unsigned long flags;
610 610
@@ -641,7 +641,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
641{ 641{
642 struct net_device *dev = (struct net_device *) dev_id; 642 struct net_device *dev = (struct net_device *) dev_id;
643 struct el3_private *lp = netdev_priv(dev); 643 struct el3_private *lp = netdev_priv(dev);
644 kio_addr_t ioaddr; 644 unsigned int ioaddr;
645 __u16 status; 645 __u16 status;
646 int i = 0, handled = 1; 646 int i = 0, handled = 1;
647 647
@@ -727,7 +727,7 @@ static void media_check(unsigned long arg)
727{ 727{
728 struct net_device *dev = (struct net_device *)(arg); 728 struct net_device *dev = (struct net_device *)(arg);
729 struct el3_private *lp = netdev_priv(dev); 729 struct el3_private *lp = netdev_priv(dev);
730 kio_addr_t ioaddr = dev->base_addr; 730 unsigned int ioaddr = dev->base_addr;
731 u16 media, errs; 731 u16 media, errs;
732 unsigned long flags; 732 unsigned long flags;
733 733
@@ -828,7 +828,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
828static void update_stats(struct net_device *dev) 828static void update_stats(struct net_device *dev)
829{ 829{
830 struct el3_private *lp = netdev_priv(dev); 830 struct el3_private *lp = netdev_priv(dev);
831 kio_addr_t ioaddr = dev->base_addr; 831 unsigned int ioaddr = dev->base_addr;
832 832
833 DEBUG(2, "%s: updating the statistics.\n", dev->name); 833 DEBUG(2, "%s: updating the statistics.\n", dev->name);
834 /* Turn off statistics updates while reading. */ 834 /* Turn off statistics updates while reading. */
@@ -855,7 +855,7 @@ static void update_stats(struct net_device *dev)
855static int el3_rx(struct net_device *dev) 855static int el3_rx(struct net_device *dev)
856{ 856{
857 struct el3_private *lp = netdev_priv(dev); 857 struct el3_private *lp = netdev_priv(dev);
858 kio_addr_t ioaddr = dev->base_addr; 858 unsigned int ioaddr = dev->base_addr;
859 int worklimit = 32; 859 int worklimit = 32;
860 short rx_status; 860 short rx_status;
861 861
@@ -909,7 +909,7 @@ static void set_multicast_list(struct net_device *dev)
909{ 909{
910 struct el3_private *lp = netdev_priv(dev); 910 struct el3_private *lp = netdev_priv(dev);
911 struct pcmcia_device *link = lp->p_dev; 911 struct pcmcia_device *link = lp->p_dev;
912 kio_addr_t ioaddr = dev->base_addr; 912 unsigned int ioaddr = dev->base_addr;
913 u16 opts = SetRxFilter | RxStation | RxBroadcast; 913 u16 opts = SetRxFilter | RxStation | RxBroadcast;
914 914
915 if (!pcmcia_dev_present(link)) return; 915 if (!pcmcia_dev_present(link)) return;
@@ -924,7 +924,7 @@ static int el3_close(struct net_device *dev)
924{ 924{
925 struct el3_private *lp = netdev_priv(dev); 925 struct el3_private *lp = netdev_priv(dev);
926 struct pcmcia_device *link = lp->p_dev; 926 struct pcmcia_device *link = lp->p_dev;
927 kio_addr_t ioaddr = dev->base_addr; 927 unsigned int ioaddr = dev->base_addr;
928 928
929 DEBUG(1, "%s: shutting down ethercard.\n", dev->name); 929 DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
930 930
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 6d342f6c14f6..e1158817cc97 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -96,8 +96,8 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id);
96static void ei_watchdog(u_long arg); 96static void ei_watchdog(u_long arg);
97static void axnet_reset_8390(struct net_device *dev); 97static void axnet_reset_8390(struct net_device *dev);
98 98
99static int mdio_read(kio_addr_t addr, int phy_id, int loc); 99static int mdio_read(unsigned int addr, int phy_id, int loc);
100static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value); 100static void mdio_write(unsigned int addr, int phy_id, int loc, int value);
101 101
102static void get_8390_hdr(struct net_device *, 102static void get_8390_hdr(struct net_device *,
103 struct e8390_pkt_hdr *, int); 103 struct e8390_pkt_hdr *, int);
@@ -203,7 +203,7 @@ static void axnet_detach(struct pcmcia_device *link)
203static int get_prom(struct pcmcia_device *link) 203static int get_prom(struct pcmcia_device *link)
204{ 204{
205 struct net_device *dev = link->priv; 205 struct net_device *dev = link->priv;
206 kio_addr_t ioaddr = dev->base_addr; 206 unsigned int ioaddr = dev->base_addr;
207 int i, j; 207 int i, j;
208 208
209 /* This is based on drivers/net/ne.c */ 209 /* This is based on drivers/net/ne.c */
@@ -473,7 +473,7 @@ static int axnet_resume(struct pcmcia_device *link)
473#define MDIO_MASK 0x0f 473#define MDIO_MASK 0x0f
474#define MDIO_ENB_IN 0x02 474#define MDIO_ENB_IN 0x02
475 475
476static void mdio_sync(kio_addr_t addr) 476static void mdio_sync(unsigned int addr)
477{ 477{
478 int bits; 478 int bits;
479 for (bits = 0; bits < 32; bits++) { 479 for (bits = 0; bits < 32; bits++) {
@@ -482,7 +482,7 @@ static void mdio_sync(kio_addr_t addr)
482 } 482 }
483} 483}
484 484
485static int mdio_read(kio_addr_t addr, int phy_id, int loc) 485static int mdio_read(unsigned int addr, int phy_id, int loc)
486{ 486{
487 u_int cmd = (0xf6<<10)|(phy_id<<5)|loc; 487 u_int cmd = (0xf6<<10)|(phy_id<<5)|loc;
488 int i, retval = 0; 488 int i, retval = 0;
@@ -501,7 +501,7 @@ static int mdio_read(kio_addr_t addr, int phy_id, int loc)
501 return (retval>>1) & 0xffff; 501 return (retval>>1) & 0xffff;
502} 502}
503 503
504static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value) 504static void mdio_write(unsigned int addr, int phy_id, int loc, int value)
505{ 505{
506 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; 506 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
507 int i; 507 int i;
@@ -575,7 +575,7 @@ static int axnet_close(struct net_device *dev)
575 575
576static void axnet_reset_8390(struct net_device *dev) 576static void axnet_reset_8390(struct net_device *dev)
577{ 577{
578 kio_addr_t nic_base = dev->base_addr; 578 unsigned int nic_base = dev->base_addr;
579 int i; 579 int i;
580 580
581 ei_status.txing = ei_status.dmaing = 0; 581 ei_status.txing = ei_status.dmaing = 0;
@@ -610,8 +610,8 @@ static void ei_watchdog(u_long arg)
610{ 610{
611 struct net_device *dev = (struct net_device *)(arg); 611 struct net_device *dev = (struct net_device *)(arg);
612 axnet_dev_t *info = PRIV(dev); 612 axnet_dev_t *info = PRIV(dev);
613 kio_addr_t nic_base = dev->base_addr; 613 unsigned int nic_base = dev->base_addr;
614 kio_addr_t mii_addr = nic_base + AXNET_MII_EEP; 614 unsigned int mii_addr = nic_base + AXNET_MII_EEP;
615 u_short link; 615 u_short link;
616 616
617 if (!netif_device_present(dev)) goto reschedule; 617 if (!netif_device_present(dev)) goto reschedule;
@@ -681,7 +681,7 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
681{ 681{
682 axnet_dev_t *info = PRIV(dev); 682 axnet_dev_t *info = PRIV(dev);
683 u16 *data = (u16 *)&rq->ifr_ifru; 683 u16 *data = (u16 *)&rq->ifr_ifru;
684 kio_addr_t mii_addr = dev->base_addr + AXNET_MII_EEP; 684 unsigned int mii_addr = dev->base_addr + AXNET_MII_EEP;
685 switch (cmd) { 685 switch (cmd) {
686 case SIOCGMIIPHY: 686 case SIOCGMIIPHY:
687 data[0] = info->phy_id; 687 data[0] = info->phy_id;
@@ -703,7 +703,7 @@ static void get_8390_hdr(struct net_device *dev,
703 struct e8390_pkt_hdr *hdr, 703 struct e8390_pkt_hdr *hdr,
704 int ring_page) 704 int ring_page)
705{ 705{
706 kio_addr_t nic_base = dev->base_addr; 706 unsigned int nic_base = dev->base_addr;
707 707
708 outb_p(0, nic_base + EN0_RSARLO); /* On page boundary */ 708 outb_p(0, nic_base + EN0_RSARLO); /* On page boundary */
709 outb_p(ring_page, nic_base + EN0_RSARHI); 709 outb_p(ring_page, nic_base + EN0_RSARHI);
@@ -721,7 +721,7 @@ static void get_8390_hdr(struct net_device *dev,
721static void block_input(struct net_device *dev, int count, 721static void block_input(struct net_device *dev, int count,
722 struct sk_buff *skb, int ring_offset) 722 struct sk_buff *skb, int ring_offset)
723{ 723{
724 kio_addr_t nic_base = dev->base_addr; 724 unsigned int nic_base = dev->base_addr;
725 int xfer_count = count; 725 int xfer_count = count;
726 char *buf = skb->data; 726 char *buf = skb->data;
727 727
@@ -744,7 +744,7 @@ static void block_input(struct net_device *dev, int count,
744static void block_output(struct net_device *dev, int count, 744static void block_output(struct net_device *dev, int count,
745 const u_char *buf, const int start_page) 745 const u_char *buf, const int start_page)
746{ 746{
747 kio_addr_t nic_base = dev->base_addr; 747 unsigned int nic_base = dev->base_addr;
748 748
749#ifdef PCMCIA_DEBUG 749#ifdef PCMCIA_DEBUG
750 if (ei_debug > 4) 750 if (ei_debug > 4)
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)
298static int mfc_try_io_port(struct pcmcia_device *link) 298static 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)
316static int ungermann_try_io_port(struct pcmcia_device *link) 317static 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)
789static void fjn_tx_timeout(struct net_device *dev) 790static 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)
819static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) 820static 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)
892static void fjn_reset(struct net_device *dev) 893static 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)
971static void fjn_rx(struct net_device *dev) 972static 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
1169static void set_rx_mode(struct net_device *dev) 1170static 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;
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---------------------------------------------------------------------------- */
521static int mace_read(mace_private *lp, kio_addr_t ioaddr, int reg) 521static 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---------------------------------------------------------------------------- */
548static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data) 548static 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)
567mace_init 568mace_init
568 Resets the MACE chip. 569 Resets the MACE chip.
569---------------------------------------------------------------------------- */ 570---------------------------------------------------------------------------- */
570static int mace_init(mace_private *lp, kio_addr_t ioaddr, char *enet_addr) 571static 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---------------------------------------------------------------------------- */
840static int mace_open(struct net_device *dev) 841static 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---------------------------------------------------------------------------- */
863static int mace_close(struct net_device *dev) 864static 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)
935static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) 936static 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
1140static int mace_rx(struct net_device *dev, unsigned char RxCnt) 1141static 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---------------------------------------------------------------------------- */
1305static void update_stats(kio_addr_t ioaddr, struct net_device *dev) 1306static 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
1541static void restore_multicast_list(struct net_device *dev) 1542static 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,
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 9ba56aa26a1b..6bc48a0673ca 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -349,7 +349,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
349static hw_info_t *get_prom(struct pcmcia_device *link) 349static hw_info_t *get_prom(struct pcmcia_device *link)
350{ 350{
351 struct net_device *dev = link->priv; 351 struct net_device *dev = link->priv;
352 kio_addr_t ioaddr = dev->base_addr; 352 unsigned int ioaddr = dev->base_addr;
353 u_char prom[32]; 353 u_char prom[32];
354 int i, j; 354 int i, j;
355 355
@@ -425,7 +425,7 @@ static hw_info_t *get_dl10019(struct pcmcia_device *link)
425static hw_info_t *get_ax88190(struct pcmcia_device *link) 425static hw_info_t *get_ax88190(struct pcmcia_device *link)
426{ 426{
427 struct net_device *dev = link->priv; 427 struct net_device *dev = link->priv;
428 kio_addr_t ioaddr = dev->base_addr; 428 unsigned int ioaddr = dev->base_addr;
429 int i, j; 429 int i, j;
430 430
431 /* Not much of a test, but the alternatives are messy */ 431 /* Not much of a test, but the alternatives are messy */
@@ -756,7 +756,7 @@ static int pcnet_resume(struct pcmcia_device *link)
756#define MDIO_DATA_READ 0x10 756#define MDIO_DATA_READ 0x10
757#define MDIO_MASK 0x0f 757#define MDIO_MASK 0x0f
758 758
759static void mdio_sync(kio_addr_t addr) 759static void mdio_sync(unsigned int addr)
760{ 760{
761 int bits, mask = inb(addr) & MDIO_MASK; 761 int bits, mask = inb(addr) & MDIO_MASK;
762 for (bits = 0; bits < 32; bits++) { 762 for (bits = 0; bits < 32; bits++) {
@@ -765,7 +765,7 @@ static void mdio_sync(kio_addr_t addr)
765 } 765 }
766} 766}
767 767
768static int mdio_read(kio_addr_t addr, int phy_id, int loc) 768static int mdio_read(unsigned int addr, int phy_id, int loc)
769{ 769{
770 u_int cmd = (0x06<<10)|(phy_id<<5)|loc; 770 u_int cmd = (0x06<<10)|(phy_id<<5)|loc;
771 int i, retval = 0, mask = inb(addr) & MDIO_MASK; 771 int i, retval = 0, mask = inb(addr) & MDIO_MASK;
@@ -784,7 +784,7 @@ static int mdio_read(kio_addr_t addr, int phy_id, int loc)
784 return (retval>>1) & 0xffff; 784 return (retval>>1) & 0xffff;
785} 785}
786 786
787static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value) 787static void mdio_write(unsigned int addr, int phy_id, int loc, int value)
788{ 788{
789 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; 789 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
790 int i, mask = inb(addr) & MDIO_MASK; 790 int i, mask = inb(addr) & MDIO_MASK;
@@ -818,10 +818,10 @@ static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value)
818 818
819#define DL19FDUPLX 0x0400 /* DL10019 Full duplex mode */ 819#define DL19FDUPLX 0x0400 /* DL10019 Full duplex mode */
820 820
821static int read_eeprom(kio_addr_t ioaddr, int location) 821static int read_eeprom(unsigned int ioaddr, int location)
822{ 822{
823 int i, retval = 0; 823 int i, retval = 0;
824 kio_addr_t ee_addr = ioaddr + DLINK_EEPROM; 824 unsigned int ee_addr = ioaddr + DLINK_EEPROM;
825 int read_cmd = location | (EE_READ_CMD << 8); 825 int read_cmd = location | (EE_READ_CMD << 8);
826 826
827 outb(0, ee_addr); 827 outb(0, ee_addr);
@@ -852,10 +852,10 @@ static int read_eeprom(kio_addr_t ioaddr, int location)
852 In ASIC mode, EE_ADOT is used to output the data to the ASIC. 852 In ASIC mode, EE_ADOT is used to output the data to the ASIC.
853*/ 853*/
854 854
855static void write_asic(kio_addr_t ioaddr, int location, short asic_data) 855static void write_asic(unsigned int ioaddr, int location, short asic_data)
856{ 856{
857 int i; 857 int i;
858 kio_addr_t ee_addr = ioaddr + DLINK_EEPROM; 858 unsigned int ee_addr = ioaddr + DLINK_EEPROM;
859 short dataval; 859 short dataval;
860 int read_cmd = location | (EE_READ_CMD << 8); 860 int read_cmd = location | (EE_READ_CMD << 8);
861 861
@@ -897,7 +897,7 @@ static void write_asic(kio_addr_t ioaddr, int location, short asic_data)
897 897
898static void set_misc_reg(struct net_device *dev) 898static void set_misc_reg(struct net_device *dev)
899{ 899{
900 kio_addr_t nic_base = dev->base_addr; 900 unsigned int nic_base = dev->base_addr;
901 pcnet_dev_t *info = PRIV(dev); 901 pcnet_dev_t *info = PRIV(dev);
902 u_char tmp; 902 u_char tmp;
903 903
@@ -936,7 +936,7 @@ static void set_misc_reg(struct net_device *dev)
936static void mii_phy_probe(struct net_device *dev) 936static void mii_phy_probe(struct net_device *dev)
937{ 937{
938 pcnet_dev_t *info = PRIV(dev); 938 pcnet_dev_t *info = PRIV(dev);
939 kio_addr_t mii_addr = dev->base_addr + DLINK_GPIO; 939 unsigned int mii_addr = dev->base_addr + DLINK_GPIO;
940 int i; 940 int i;
941 u_int tmp, phyid; 941 u_int tmp, phyid;
942 942
@@ -1014,7 +1014,7 @@ static int pcnet_close(struct net_device *dev)
1014 1014
1015static void pcnet_reset_8390(struct net_device *dev) 1015static void pcnet_reset_8390(struct net_device *dev)
1016{ 1016{
1017 kio_addr_t nic_base = dev->base_addr; 1017 unsigned int nic_base = dev->base_addr;
1018 int i; 1018 int i;
1019 1019
1020 ei_status.txing = ei_status.dmaing = 0; 1020 ei_status.txing = ei_status.dmaing = 0;
@@ -1074,8 +1074,8 @@ static void ei_watchdog(u_long arg)
1074{ 1074{
1075 struct net_device *dev = (struct net_device *)arg; 1075 struct net_device *dev = (struct net_device *)arg;
1076 pcnet_dev_t *info = PRIV(dev); 1076 pcnet_dev_t *info = PRIV(dev);
1077 kio_addr_t nic_base = dev->base_addr; 1077 unsigned int nic_base = dev->base_addr;
1078 kio_addr_t mii_addr = nic_base + DLINK_GPIO; 1078 unsigned int mii_addr = nic_base + DLINK_GPIO;
1079 u_short link; 1079 u_short link;
1080 1080
1081 if (!netif_device_present(dev)) goto reschedule; 1081 if (!netif_device_present(dev)) goto reschedule;
@@ -1177,7 +1177,7 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1177{ 1177{
1178 pcnet_dev_t *info = PRIV(dev); 1178 pcnet_dev_t *info = PRIV(dev);
1179 u16 *data = (u16 *)&rq->ifr_ifru; 1179 u16 *data = (u16 *)&rq->ifr_ifru;
1180 kio_addr_t mii_addr = dev->base_addr + DLINK_GPIO; 1180 unsigned int mii_addr = dev->base_addr + DLINK_GPIO;
1181 switch (cmd) { 1181 switch (cmd) {
1182 case SIOCGMIIPHY: 1182 case SIOCGMIIPHY:
1183 data[0] = info->phy_id; 1183 data[0] = info->phy_id;
@@ -1199,7 +1199,7 @@ static void dma_get_8390_hdr(struct net_device *dev,
1199 struct e8390_pkt_hdr *hdr, 1199 struct e8390_pkt_hdr *hdr,
1200 int ring_page) 1200 int ring_page)
1201{ 1201{
1202 kio_addr_t nic_base = dev->base_addr; 1202 unsigned int nic_base = dev->base_addr;
1203 1203
1204 if (ei_status.dmaing) { 1204 if (ei_status.dmaing) {
1205 printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input." 1205 printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input."
@@ -1230,7 +1230,7 @@ static void dma_get_8390_hdr(struct net_device *dev,
1230static void dma_block_input(struct net_device *dev, int count, 1230static void dma_block_input(struct net_device *dev, int count,
1231 struct sk_buff *skb, int ring_offset) 1231 struct sk_buff *skb, int ring_offset)
1232{ 1232{
1233 kio_addr_t nic_base = dev->base_addr; 1233 unsigned int nic_base = dev->base_addr;
1234 int xfer_count = count; 1234 int xfer_count = count;
1235 char *buf = skb->data; 1235 char *buf = skb->data;
1236 1236
@@ -1285,7 +1285,7 @@ static void dma_block_input(struct net_device *dev, int count,
1285static void dma_block_output(struct net_device *dev, int count, 1285static void dma_block_output(struct net_device *dev, int count,
1286 const u_char *buf, const int start_page) 1286 const u_char *buf, const int start_page)
1287{ 1287{
1288 kio_addr_t nic_base = dev->base_addr; 1288 unsigned int nic_base = dev->base_addr;
1289 pcnet_dev_t *info = PRIV(dev); 1289 pcnet_dev_t *info = PRIV(dev);
1290#ifdef PCMCIA_DEBUG 1290#ifdef PCMCIA_DEBUG
1291 int retries = 0; 1291 int retries = 0;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index c9868e9dac4c..f18eca9831e8 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -295,7 +295,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map);
295static void smc_set_xcvr(struct net_device *dev, int if_port); 295static void smc_set_xcvr(struct net_device *dev, int if_port);
296static void smc_reset(struct net_device *dev); 296static void smc_reset(struct net_device *dev);
297static void media_check(u_long arg); 297static void media_check(u_long arg);
298static void mdio_sync(kio_addr_t addr); 298static void mdio_sync(unsigned int addr);
299static int mdio_read(struct net_device *dev, int phy_id, int loc); 299static int mdio_read(struct net_device *dev, int phy_id, int loc);
300static void mdio_write(struct net_device *dev, int phy_id, int loc, int value); 300static void mdio_write(struct net_device *dev, int phy_id, int loc, int value);
301static int smc_link_ok(struct net_device *dev); 301static int smc_link_ok(struct net_device *dev);
@@ -601,8 +601,8 @@ static void mot_config(struct pcmcia_device *link)
601{ 601{
602 struct net_device *dev = link->priv; 602 struct net_device *dev = link->priv;
603 struct smc_private *smc = netdev_priv(dev); 603 struct smc_private *smc = netdev_priv(dev);
604 kio_addr_t ioaddr = dev->base_addr; 604 unsigned int ioaddr = dev->base_addr;
605 kio_addr_t iouart = link->io.BasePort2; 605 unsigned int iouart = link->io.BasePort2;
606 606
607 /* Set UART base address and force map with COR bit 1 */ 607 /* Set UART base address and force map with COR bit 1 */
608 writeb(iouart & 0xff, smc->base + MOT_UART + CISREG_IOBASE_0); 608 writeb(iouart & 0xff, smc->base + MOT_UART + CISREG_IOBASE_0);
@@ -621,7 +621,7 @@ static void mot_config(struct pcmcia_device *link)
621static int mot_setup(struct pcmcia_device *link) 621static int mot_setup(struct pcmcia_device *link)
622{ 622{
623 struct net_device *dev = link->priv; 623 struct net_device *dev = link->priv;
624 kio_addr_t ioaddr = dev->base_addr; 624 unsigned int ioaddr = dev->base_addr;
625 int i, wait, loop; 625 int i, wait, loop;
626 u_int addr; 626 u_int addr;
627 627
@@ -754,7 +754,7 @@ free_cfg_mem:
754static int osi_config(struct pcmcia_device *link) 754static int osi_config(struct pcmcia_device *link)
755{ 755{
756 struct net_device *dev = link->priv; 756 struct net_device *dev = link->priv;
757 static const kio_addr_t com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; 757 static const unsigned int com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
758 int i, j; 758 int i, j;
759 759
760 link->conf.Attributes |= CONF_ENABLE_SPKR; 760 link->conf.Attributes |= CONF_ENABLE_SPKR;
@@ -900,7 +900,7 @@ static int smc91c92_resume(struct pcmcia_device *link)
900static int check_sig(struct pcmcia_device *link) 900static int check_sig(struct pcmcia_device *link)
901{ 901{
902 struct net_device *dev = link->priv; 902 struct net_device *dev = link->priv;
903 kio_addr_t ioaddr = dev->base_addr; 903 unsigned int ioaddr = dev->base_addr;
904 int width; 904 int width;
905 u_short s; 905 u_short s;
906 906
@@ -960,7 +960,7 @@ static int smc91c92_config(struct pcmcia_device *link)
960 struct smc_private *smc = netdev_priv(dev); 960 struct smc_private *smc = netdev_priv(dev);
961 char *name; 961 char *name;
962 int i, j, rev; 962 int i, j, rev;
963 kio_addr_t ioaddr; 963 unsigned int ioaddr;
964 u_long mir; 964 u_long mir;
965 DECLARE_MAC_BUF(mac); 965 DECLARE_MAC_BUF(mac);
966 966
@@ -1136,7 +1136,7 @@ static void smc91c92_release(struct pcmcia_device *link)
1136#define MDIO_DATA_WRITE1 (MDIO_DIR_WRITE | MDIO_DATA_OUT) 1136#define MDIO_DATA_WRITE1 (MDIO_DIR_WRITE | MDIO_DATA_OUT)
1137#define MDIO_DATA_READ 0x02 1137#define MDIO_DATA_READ 0x02
1138 1138
1139static void mdio_sync(kio_addr_t addr) 1139static void mdio_sync(unsigned int addr)
1140{ 1140{
1141 int bits; 1141 int bits;
1142 for (bits = 0; bits < 32; bits++) { 1142 for (bits = 0; bits < 32; bits++) {
@@ -1147,7 +1147,7 @@ static void mdio_sync(kio_addr_t addr)
1147 1147
1148static int mdio_read(struct net_device *dev, int phy_id, int loc) 1148static int mdio_read(struct net_device *dev, int phy_id, int loc)
1149{ 1149{
1150 kio_addr_t addr = dev->base_addr + MGMT; 1150 unsigned int addr = dev->base_addr + MGMT;
1151 u_int cmd = (0x06<<10)|(phy_id<<5)|loc; 1151 u_int cmd = (0x06<<10)|(phy_id<<5)|loc;
1152 int i, retval = 0; 1152 int i, retval = 0;
1153 1153
@@ -1167,7 +1167,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
1167 1167
1168static void mdio_write(struct net_device *dev, int phy_id, int loc, int value) 1168static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
1169{ 1169{
1170 kio_addr_t addr = dev->base_addr + MGMT; 1170 unsigned int addr = dev->base_addr + MGMT;
1171 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; 1171 u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
1172 int i; 1172 int i;
1173 1173
@@ -1193,7 +1193,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
1193#ifdef PCMCIA_DEBUG 1193#ifdef PCMCIA_DEBUG
1194static void smc_dump(struct net_device *dev) 1194static void smc_dump(struct net_device *dev)
1195{ 1195{
1196 kio_addr_t ioaddr = dev->base_addr; 1196 unsigned int ioaddr = dev->base_addr;
1197 u_short i, w, save; 1197 u_short i, w, save;
1198 save = inw(ioaddr + BANK_SELECT); 1198 save = inw(ioaddr + BANK_SELECT);
1199 for (w = 0; w < 4; w++) { 1199 for (w = 0; w < 4; w++) {
@@ -1248,7 +1248,7 @@ static int smc_close(struct net_device *dev)
1248{ 1248{
1249 struct smc_private *smc = netdev_priv(dev); 1249 struct smc_private *smc = netdev_priv(dev);
1250 struct pcmcia_device *link = smc->p_dev; 1250 struct pcmcia_device *link = smc->p_dev;
1251 kio_addr_t ioaddr = dev->base_addr; 1251 unsigned int ioaddr = dev->base_addr;
1252 1252
1253 DEBUG(0, "%s: smc_close(), status %4.4x.\n", 1253 DEBUG(0, "%s: smc_close(), status %4.4x.\n",
1254 dev->name, inw(ioaddr + BANK_SELECT)); 1254 dev->name, inw(ioaddr + BANK_SELECT));
@@ -1285,7 +1285,7 @@ static void smc_hardware_send_packet(struct net_device * dev)
1285{ 1285{
1286 struct smc_private *smc = netdev_priv(dev); 1286 struct smc_private *smc = netdev_priv(dev);
1287 struct sk_buff *skb = smc->saved_skb; 1287 struct sk_buff *skb = smc->saved_skb;
1288 kio_addr_t ioaddr = dev->base_addr; 1288 unsigned int ioaddr = dev->base_addr;
1289 u_char packet_no; 1289 u_char packet_no;
1290 1290
1291 if (!skb) { 1291 if (!skb) {
@@ -1349,7 +1349,7 @@ static void smc_hardware_send_packet(struct net_device * dev)
1349static void smc_tx_timeout(struct net_device *dev) 1349static void smc_tx_timeout(struct net_device *dev)
1350{ 1350{
1351 struct smc_private *smc = netdev_priv(dev); 1351 struct smc_private *smc = netdev_priv(dev);
1352 kio_addr_t ioaddr = dev->base_addr; 1352 unsigned int ioaddr = dev->base_addr;
1353 1353
1354 printk(KERN_NOTICE "%s: SMC91c92 transmit timed out, " 1354 printk(KERN_NOTICE "%s: SMC91c92 transmit timed out, "
1355 "Tx_status %2.2x status %4.4x.\n", 1355 "Tx_status %2.2x status %4.4x.\n",
@@ -1364,7 +1364,7 @@ static void smc_tx_timeout(struct net_device *dev)
1364static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) 1364static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
1365{ 1365{
1366 struct smc_private *smc = netdev_priv(dev); 1366 struct smc_private *smc = netdev_priv(dev);
1367 kio_addr_t ioaddr = dev->base_addr; 1367 unsigned int ioaddr = dev->base_addr;
1368 u_short num_pages; 1368 u_short num_pages;
1369 short time_out, ir; 1369 short time_out, ir;
1370 unsigned long flags; 1370 unsigned long flags;
@@ -1434,7 +1434,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
1434static void smc_tx_err(struct net_device * dev) 1434static void smc_tx_err(struct net_device * dev)
1435{ 1435{
1436 struct smc_private *smc = netdev_priv(dev); 1436 struct smc_private *smc = netdev_priv(dev);
1437 kio_addr_t ioaddr = dev->base_addr; 1437 unsigned int ioaddr = dev->base_addr;
1438 int saved_packet = inw(ioaddr + PNR_ARR) & 0xff; 1438 int saved_packet = inw(ioaddr + PNR_ARR) & 0xff;
1439 int packet_no = inw(ioaddr + FIFO_PORTS) & 0x7f; 1439 int packet_no = inw(ioaddr + FIFO_PORTS) & 0x7f;
1440 int tx_status; 1440 int tx_status;
@@ -1478,7 +1478,7 @@ static void smc_tx_err(struct net_device * dev)
1478static void smc_eph_irq(struct net_device *dev) 1478static void smc_eph_irq(struct net_device *dev)
1479{ 1479{
1480 struct smc_private *smc = netdev_priv(dev); 1480 struct smc_private *smc = netdev_priv(dev);
1481 kio_addr_t ioaddr = dev->base_addr; 1481 unsigned int ioaddr = dev->base_addr;
1482 u_short card_stats, ephs; 1482 u_short card_stats, ephs;
1483 1483
1484 SMC_SELECT_BANK(0); 1484 SMC_SELECT_BANK(0);
@@ -1513,7 +1513,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
1513{ 1513{
1514 struct net_device *dev = dev_id; 1514 struct net_device *dev = dev_id;
1515 struct smc_private *smc = netdev_priv(dev); 1515 struct smc_private *smc = netdev_priv(dev);
1516 kio_addr_t ioaddr; 1516 unsigned int ioaddr;
1517 u_short saved_bank, saved_pointer, mask, status; 1517 u_short saved_bank, saved_pointer, mask, status;
1518 unsigned int handled = 1; 1518 unsigned int handled = 1;
1519 char bogus_cnt = INTR_WORK; /* Work we are willing to do. */ 1519 char bogus_cnt = INTR_WORK; /* Work we are willing to do. */
@@ -1633,7 +1633,7 @@ irq_done:
1633static void smc_rx(struct net_device *dev) 1633static void smc_rx(struct net_device *dev)
1634{ 1634{
1635 struct smc_private *smc = netdev_priv(dev); 1635 struct smc_private *smc = netdev_priv(dev);
1636 kio_addr_t ioaddr = dev->base_addr; 1636 unsigned int ioaddr = dev->base_addr;
1637 int rx_status; 1637 int rx_status;
1638 int packet_length; /* Caution: not frame length, rather words 1638 int packet_length; /* Caution: not frame length, rather words
1639 to transfer from the chip. */ 1639 to transfer from the chip. */
@@ -1738,7 +1738,7 @@ static void fill_multicast_tbl(int count, struct dev_mc_list *addrs,
1738 1738
1739static void set_rx_mode(struct net_device *dev) 1739static void set_rx_mode(struct net_device *dev)
1740{ 1740{
1741 kio_addr_t ioaddr = dev->base_addr; 1741 unsigned int ioaddr = dev->base_addr;
1742 struct smc_private *smc = netdev_priv(dev); 1742 struct smc_private *smc = netdev_priv(dev);
1743 u_int multicast_table[ 2 ] = { 0, }; 1743 u_int multicast_table[ 2 ] = { 0, };
1744 unsigned long flags; 1744 unsigned long flags;
@@ -1804,7 +1804,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map)
1804static void smc_set_xcvr(struct net_device *dev, int if_port) 1804static void smc_set_xcvr(struct net_device *dev, int if_port)
1805{ 1805{
1806 struct smc_private *smc = netdev_priv(dev); 1806 struct smc_private *smc = netdev_priv(dev);
1807 kio_addr_t ioaddr = dev->base_addr; 1807 unsigned int ioaddr = dev->base_addr;
1808 u_short saved_bank; 1808 u_short saved_bank;
1809 1809
1810 saved_bank = inw(ioaddr + BANK_SELECT); 1810 saved_bank = inw(ioaddr + BANK_SELECT);
@@ -1827,7 +1827,7 @@ static void smc_set_xcvr(struct net_device *dev, int if_port)
1827 1827
1828static void smc_reset(struct net_device *dev) 1828static void smc_reset(struct net_device *dev)
1829{ 1829{
1830 kio_addr_t ioaddr = dev->base_addr; 1830 unsigned int ioaddr = dev->base_addr;
1831 struct smc_private *smc = netdev_priv(dev); 1831 struct smc_private *smc = netdev_priv(dev);
1832 int i; 1832 int i;
1833 1833
@@ -1904,7 +1904,7 @@ static void media_check(u_long arg)
1904{ 1904{
1905 struct net_device *dev = (struct net_device *) arg; 1905 struct net_device *dev = (struct net_device *) arg;
1906 struct smc_private *smc = netdev_priv(dev); 1906 struct smc_private *smc = netdev_priv(dev);
1907 kio_addr_t ioaddr = dev->base_addr; 1907 unsigned int ioaddr = dev->base_addr;
1908 u_short i, media, saved_bank; 1908 u_short i, media, saved_bank;
1909 u_short link; 1909 u_short link;
1910 unsigned long flags; 1910 unsigned long flags;
@@ -2021,7 +2021,7 @@ reschedule:
2021 2021
2022static int smc_link_ok(struct net_device *dev) 2022static int smc_link_ok(struct net_device *dev)
2023{ 2023{
2024 kio_addr_t ioaddr = dev->base_addr; 2024 unsigned int ioaddr = dev->base_addr;
2025 struct smc_private *smc = netdev_priv(dev); 2025 struct smc_private *smc = netdev_priv(dev);
2026 2026
2027 if (smc->cfg & CFG_MII_SELECT) { 2027 if (smc->cfg & CFG_MII_SELECT) {
@@ -2035,7 +2035,7 @@ static int smc_link_ok(struct net_device *dev)
2035static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) 2035static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2036{ 2036{
2037 u16 tmp; 2037 u16 tmp;
2038 kio_addr_t ioaddr = dev->base_addr; 2038 unsigned int ioaddr = dev->base_addr;
2039 2039
2040 ecmd->supported = (SUPPORTED_TP | SUPPORTED_AUI | 2040 ecmd->supported = (SUPPORTED_TP | SUPPORTED_AUI |
2041 SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full); 2041 SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full);
@@ -2057,7 +2057,7 @@ static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2057static int smc_netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) 2057static int smc_netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2058{ 2058{
2059 u16 tmp; 2059 u16 tmp;
2060 kio_addr_t ioaddr = dev->base_addr; 2060 unsigned int ioaddr = dev->base_addr;
2061 2061
2062 if (ecmd->speed != SPEED_10) 2062 if (ecmd->speed != SPEED_10)
2063 return -EINVAL; 2063 return -EINVAL;
@@ -2100,7 +2100,7 @@ static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
2100static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 2100static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2101{ 2101{
2102 struct smc_private *smc = netdev_priv(dev); 2102 struct smc_private *smc = netdev_priv(dev);
2103 kio_addr_t ioaddr = dev->base_addr; 2103 unsigned int ioaddr = dev->base_addr;
2104 u16 saved_bank = inw(ioaddr + BANK_SELECT); 2104 u16 saved_bank = inw(ioaddr + BANK_SELECT);
2105 int ret; 2105 int ret;
2106 2106
@@ -2118,7 +2118,7 @@ static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2118static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 2118static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2119{ 2119{
2120 struct smc_private *smc = netdev_priv(dev); 2120 struct smc_private *smc = netdev_priv(dev);
2121 kio_addr_t ioaddr = dev->base_addr; 2121 unsigned int ioaddr = dev->base_addr;
2122 u16 saved_bank = inw(ioaddr + BANK_SELECT); 2122 u16 saved_bank = inw(ioaddr + BANK_SELECT);
2123 int ret; 2123 int ret;
2124 2124
@@ -2136,7 +2136,7 @@ static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2136static u32 smc_get_link(struct net_device *dev) 2136static u32 smc_get_link(struct net_device *dev)
2137{ 2137{
2138 struct smc_private *smc = netdev_priv(dev); 2138 struct smc_private *smc = netdev_priv(dev);
2139 kio_addr_t ioaddr = dev->base_addr; 2139 unsigned int ioaddr = dev->base_addr;
2140 u16 saved_bank = inw(ioaddr + BANK_SELECT); 2140 u16 saved_bank = inw(ioaddr + BANK_SELECT);
2141 u32 ret; 2141 u32 ret;
2142 2142
@@ -2164,7 +2164,7 @@ static int smc_nway_reset(struct net_device *dev)
2164{ 2164{
2165 struct smc_private *smc = netdev_priv(dev); 2165 struct smc_private *smc = netdev_priv(dev);
2166 if (smc->cfg & CFG_MII_SELECT) { 2166 if (smc->cfg & CFG_MII_SELECT) {
2167 kio_addr_t ioaddr = dev->base_addr; 2167 unsigned int ioaddr = dev->base_addr;
2168 u16 saved_bank = inw(ioaddr + BANK_SELECT); 2168 u16 saved_bank = inw(ioaddr + BANK_SELECT);
2169 int res; 2169 int res;
2170 2170
@@ -2196,7 +2196,7 @@ static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
2196 struct mii_ioctl_data *mii = if_mii(rq); 2196 struct mii_ioctl_data *mii = if_mii(rq);
2197 int rc = 0; 2197 int rc = 0;
2198 u16 saved_bank; 2198 u16 saved_bank;
2199 kio_addr_t ioaddr = dev->base_addr; 2199 unsigned int ioaddr = dev->base_addr;
2200 2200
2201 if (!netif_running(dev)) 2201 if (!netif_running(dev))
2202 return -EINVAL; 2202 return -EINVAL;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 1f09bea6db5a..d041f831a18d 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -273,12 +273,12 @@ INT_MODULE_PARM(lockup_hack, 0); /* anti lockup hack */
273static unsigned maxrx_bytes = 22000; 273static unsigned maxrx_bytes = 22000;
274 274
275/* MII management prototypes */ 275/* MII management prototypes */
276static void mii_idle(kio_addr_t ioaddr); 276static void mii_idle(unsigned int ioaddr);
277static void mii_putbit(kio_addr_t ioaddr, unsigned data); 277static void mii_putbit(unsigned int ioaddr, unsigned data);
278static int mii_getbit(kio_addr_t ioaddr); 278static int mii_getbit(unsigned int ioaddr);
279static void mii_wbits(kio_addr_t ioaddr, unsigned data, int len); 279static void mii_wbits(unsigned int ioaddr, unsigned data, int len);
280static unsigned mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg); 280static unsigned mii_rd(unsigned int ioaddr, u_char phyaddr, u_char phyreg);
281static void mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg, 281static void mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg,
282 unsigned data, int len); 282 unsigned data, int len);
283 283
284/* 284/*
@@ -403,7 +403,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
403static void 403static void
404PrintRegisters(struct net_device *dev) 404PrintRegisters(struct net_device *dev)
405{ 405{
406 kio_addr_t ioaddr = dev->base_addr; 406 unsigned int ioaddr = dev->base_addr;
407 407
408 if (pc_debug > 1) { 408 if (pc_debug > 1) {
409 int i, page; 409 int i, page;
@@ -439,7 +439,7 @@ PrintRegisters(struct net_device *dev)
439 * Turn around for read 439 * Turn around for read
440 */ 440 */
441static void 441static void
442mii_idle(kio_addr_t ioaddr) 442mii_idle(unsigned int ioaddr)
443{ 443{
444 PutByte(XIRCREG2_GPR2, 0x04|0); /* drive MDCK low */ 444 PutByte(XIRCREG2_GPR2, 0x04|0); /* drive MDCK low */
445 udelay(1); 445 udelay(1);
@@ -451,7 +451,7 @@ mii_idle(kio_addr_t ioaddr)
451 * Write a bit to MDI/O 451 * Write a bit to MDI/O
452 */ 452 */
453static void 453static void
454mii_putbit(kio_addr_t ioaddr, unsigned data) 454mii_putbit(unsigned int ioaddr, unsigned data)
455{ 455{
456 #if 1 456 #if 1
457 if (data) { 457 if (data) {
@@ -484,7 +484,7 @@ mii_putbit(kio_addr_t ioaddr, unsigned data)
484 * Get a bit from MDI/O 484 * Get a bit from MDI/O
485 */ 485 */
486static int 486static int
487mii_getbit(kio_addr_t ioaddr) 487mii_getbit(unsigned int ioaddr)
488{ 488{
489 unsigned d; 489 unsigned d;
490 490
@@ -497,7 +497,7 @@ mii_getbit(kio_addr_t ioaddr)
497} 497}
498 498
499static void 499static void
500mii_wbits(kio_addr_t ioaddr, unsigned data, int len) 500mii_wbits(unsigned int ioaddr, unsigned data, int len)
501{ 501{
502 unsigned m = 1 << (len-1); 502 unsigned m = 1 << (len-1);
503 for (; m; m >>= 1) 503 for (; m; m >>= 1)
@@ -505,7 +505,7 @@ mii_wbits(kio_addr_t ioaddr, unsigned data, int len)
505} 505}
506 506
507static unsigned 507static unsigned
508mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg) 508mii_rd(unsigned int ioaddr, u_char phyaddr, u_char phyreg)
509{ 509{
510 int i; 510 int i;
511 unsigned data=0, m; 511 unsigned data=0, m;
@@ -527,7 +527,8 @@ mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg)
527} 527}
528 528
529static void 529static void
530mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg, unsigned data, int len) 530mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg, unsigned data,
531 int len)
531{ 532{
532 int i; 533 int i;
533 534
@@ -726,7 +727,7 @@ xirc2ps_config(struct pcmcia_device * link)
726 local_info_t *local = netdev_priv(dev); 727 local_info_t *local = netdev_priv(dev);
727 tuple_t tuple; 728 tuple_t tuple;
728 cisparse_t parse; 729 cisparse_t parse;
729 kio_addr_t ioaddr; 730 unsigned int ioaddr;
730 int err, i; 731 int err, i;
731 u_char buf[64]; 732 u_char buf[64];
732 cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data; 733 cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
@@ -1104,7 +1105,7 @@ xirc2ps_interrupt(int irq, void *dev_id)
1104{ 1105{
1105 struct net_device *dev = (struct net_device *)dev_id; 1106 struct net_device *dev = (struct net_device *)dev_id;
1106 local_info_t *lp = netdev_priv(dev); 1107 local_info_t *lp = netdev_priv(dev);
1107 kio_addr_t ioaddr; 1108 unsigned int ioaddr;
1108 u_char saved_page; 1109 u_char saved_page;
1109 unsigned bytes_rcvd; 1110 unsigned bytes_rcvd;
1110 unsigned int_status, eth_status, rx_status, tx_status; 1111 unsigned int_status, eth_status, rx_status, tx_status;
@@ -1209,7 +1210,7 @@ xirc2ps_interrupt(int irq, void *dev_id)
1209 unsigned i; 1210 unsigned i;
1210 u_long *p = skb_put(skb, pktlen); 1211 u_long *p = skb_put(skb, pktlen);
1211 register u_long a; 1212 register u_long a;
1212 kio_addr_t edpreg = ioaddr+XIRCREG_EDP-2; 1213 unsigned int edpreg = ioaddr+XIRCREG_EDP-2;
1213 for (i=0; i < len ; i += 4, p++) { 1214 for (i=0; i < len ; i += 4, p++) {
1214 a = inl(edpreg); 1215 a = inl(edpreg);
1215 __asm__("rorl $16,%0\n\t" 1216 __asm__("rorl $16,%0\n\t"
@@ -1346,7 +1347,7 @@ static int
1346do_start_xmit(struct sk_buff *skb, struct net_device *dev) 1347do_start_xmit(struct sk_buff *skb, struct net_device *dev)
1347{ 1348{
1348 local_info_t *lp = netdev_priv(dev); 1349 local_info_t *lp = netdev_priv(dev);
1349 kio_addr_t ioaddr = dev->base_addr; 1350 unsigned int ioaddr = dev->base_addr;
1350 int okay; 1351 int okay;
1351 unsigned freespace; 1352 unsigned freespace;
1352 unsigned pktlen = skb->len; 1353 unsigned pktlen = skb->len;
@@ -1415,7 +1416,7 @@ do_get_stats(struct net_device *dev)
1415static void 1416static void
1416set_addresses(struct net_device *dev) 1417set_addresses(struct net_device *dev)
1417{ 1418{
1418 kio_addr_t ioaddr = dev->base_addr; 1419 unsigned int ioaddr = dev->base_addr;
1419 local_info_t *lp = netdev_priv(dev); 1420 local_info_t *lp = netdev_priv(dev);
1420 struct dev_mc_list *dmi = dev->mc_list; 1421 struct dev_mc_list *dmi = dev->mc_list;
1421 unsigned char *addr; 1422 unsigned char *addr;
@@ -1459,7 +1460,7 @@ set_addresses(struct net_device *dev)
1459static void 1460static void
1460set_multicast_list(struct net_device *dev) 1461set_multicast_list(struct net_device *dev)
1461{ 1462{
1462 kio_addr_t ioaddr = dev->base_addr; 1463 unsigned int ioaddr = dev->base_addr;
1463 1464
1464 SelectPage(0x42); 1465 SelectPage(0x42);
1465 if (dev->flags & IFF_PROMISC) { /* snoop */ 1466 if (dev->flags & IFF_PROMISC) { /* snoop */
@@ -1543,7 +1544,7 @@ static int
1543do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 1544do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1544{ 1545{
1545 local_info_t *local = netdev_priv(dev); 1546 local_info_t *local = netdev_priv(dev);
1546 kio_addr_t ioaddr = dev->base_addr; 1547 unsigned int ioaddr = dev->base_addr;
1547 u16 *data = (u16 *)&rq->ifr_ifru; 1548 u16 *data = (u16 *)&rq->ifr_ifru;
1548 1549
1549 DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n", 1550 DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n",
@@ -1575,7 +1576,7 @@ static void
1575hardreset(struct net_device *dev) 1576hardreset(struct net_device *dev)
1576{ 1577{
1577 local_info_t *local = netdev_priv(dev); 1578 local_info_t *local = netdev_priv(dev);
1578 kio_addr_t ioaddr = dev->base_addr; 1579 unsigned int ioaddr = dev->base_addr;
1579 1580
1580 SelectPage(4); 1581 SelectPage(4);
1581 udelay(1); 1582 udelay(1);
@@ -1592,7 +1593,7 @@ static void
1592do_reset(struct net_device *dev, int full) 1593do_reset(struct net_device *dev, int full)
1593{ 1594{
1594 local_info_t *local = netdev_priv(dev); 1595 local_info_t *local = netdev_priv(dev);
1595 kio_addr_t ioaddr = dev->base_addr; 1596 unsigned int ioaddr = dev->base_addr;
1596 unsigned value; 1597 unsigned value;
1597 1598
1598 DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full); 1599 DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
@@ -1753,7 +1754,7 @@ static int
1753init_mii(struct net_device *dev) 1754init_mii(struct net_device *dev)
1754{ 1755{
1755 local_info_t *local = netdev_priv(dev); 1756 local_info_t *local = netdev_priv(dev);
1756 kio_addr_t ioaddr = dev->base_addr; 1757 unsigned int ioaddr = dev->base_addr;
1757 unsigned control, status, linkpartner; 1758 unsigned control, status, linkpartner;
1758 int i; 1759 int i;
1759 1760
@@ -1826,7 +1827,7 @@ static void
1826do_powerdown(struct net_device *dev) 1827do_powerdown(struct net_device *dev)
1827{ 1828{
1828 1829
1829 kio_addr_t ioaddr = dev->base_addr; 1830 unsigned int ioaddr = dev->base_addr;
1830 1831
1831 DEBUG(0, "do_powerdown(%p)\n", dev); 1832 DEBUG(0, "do_powerdown(%p)\n", dev);
1832 1833
@@ -1838,7 +1839,7 @@ do_powerdown(struct net_device *dev)
1838static int 1839static int
1839do_stop(struct net_device *dev) 1840do_stop(struct net_device *dev)
1840{ 1841{
1841 kio_addr_t ioaddr = dev->base_addr; 1842 unsigned int ioaddr = dev->base_addr;
1842 local_info_t *lp = netdev_priv(dev); 1843 local_info_t *lp = netdev_priv(dev);
1843 struct pcmcia_device *link = lp->p_dev; 1844 struct pcmcia_device *link = lp->p_dev;
1844 1845
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-29 03:37:45 -0500