Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
大约 1 年 前同步成功

通知 158
Star 36
Fork 7
cloud-kernel
cloud-kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 906da809 编写于 作者: O Olof Johansson 提交者： Linus Torvalds
浏览文件
操作

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: NOlof 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 ecb8a847
显示空白变更内容
内联 并排
Showing with 228 addition and 222 deletion
Documentation/pcmcia/driver-changes.txt
浏览文件 @ 906da809
...@@ -33,8 +33,8 @@ This file details changes in 2.6 which affect PCMCIA card driver authors: ...@@ -33,8 +33,8 @@ This file details changes in 2.6 which affect PCMCIA card driver authors:
and can be used (e.g. for SET_NETDEV_DEV) by using and can be used (e.g. for SET_NETDEV_DEV) by using
handle_to_dev(client_handle_t * handle). handle_to_dev(client_handle_t * handle).
* Convert internal I/O port addresses to unsigned long (as of 2.6.11) * Convert internal I/O port addresses to unsigned int (as of 2.6.11)
ioaddr_t should be replaced by kio_addr_t in PCMCIA card drivers. ioaddr_t should be replaced by unsigned int in PCMCIA card drivers.
* irq_mask and irq_list parameters (as of 2.6.11) * irq_mask and irq_list parameters (as of 2.6.11)
The irq_mask and irq_list parameters should no longer be used in The irq_mask and irq_list parameters should no longer be used in
......
drivers/bluetooth/bt3c_cs.c
浏览文件 @ 906da809
...@@ -704,7 +704,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t * ...@@ -704,7 +704,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
static int bt3c_config(struct pcmcia_device *link) static int bt3c_config(struct pcmcia_device *link)
{ {
static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
bt3c_info_t *info = link->priv; bt3c_info_t *info = link->priv;
tuple_t tuple; tuple_t tuple;
u_short buf[256]; u_short buf[256];
......
drivers/bluetooth/btuart_cs.c
浏览文件 @ 906da809
...@@ -634,7 +634,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t * ...@@ -634,7 +634,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
static int btuart_config(struct pcmcia_device *link) static int btuart_config(struct pcmcia_device *link)
{ {
static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
btuart_info_t *info = link->priv; btuart_info_t *info = link->priv;
tuple_t tuple; tuple_t tuple;
u_short buf[256]; u_short buf[256];
......
drivers/net/pcmcia/3c574_cs.c
浏览文件 @ 906da809
...@@ -230,10 +230,11 @@ static char mii_preamble_required = 0; ...@@ -230,10 +230,11 @@ static char mii_preamble_required = 0;
static int tc574_config(struct pcmcia_device *link); static int tc574_config(struct pcmcia_device *link);
static void tc574_release(struct pcmcia_device *link); static void tc574_release(struct pcmcia_device *link);
static void mdio_sync(kio_addr_t ioaddr, int bits); static void mdio_sync(unsigned int ioaddr, int bits);
static int mdio_read(kio_addr_t ioaddr, int phy_id, int location); static int mdio_read(unsigned int ioaddr, int phy_id, int location);
static void mdio_write(kio_addr_t ioaddr, int phy_id, int location, int value); static void mdio_write(unsigned int ioaddr, int phy_id, int location,
static unsigned short read_eeprom(kio_addr_t ioaddr, int index); int value);
static unsigned short read_eeprom(unsigned int ioaddr, int index);
static void tc574_wait_for_completion(struct net_device *dev, int cmd); static void tc574_wait_for_completion(struct net_device *dev, int cmd);
static void tc574_reset(struct net_device *dev); static void tc574_reset(struct net_device *dev);
...@@ -341,7 +342,7 @@ static int tc574_config(struct pcmcia_device *link) ...@@ -341,7 +342,7 @@ static int tc574_config(struct pcmcia_device *link)
tuple_t tuple; tuple_t tuple;
__le16 buf[32]; __le16 buf[32];
int last_fn, last_ret, i, j; int last_fn, last_ret, i, j;
kio_addr_t ioaddr; unsigned int ioaddr;
__be16 *phys_addr; __be16 *phys_addr;
char *cardname; char *cardname;
__u32 config; __u32 config;
...@@ -515,7 +516,7 @@ static int tc574_resume(struct pcmcia_device *link) ...@@ -515,7 +516,7 @@ static int tc574_resume(struct pcmcia_device *link)
static void dump_status(struct net_device *dev) static void dump_status(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
EL3WINDOW(1); EL3WINDOW(1);
printk(KERN_INFO " irq status %04x, rx status %04x, tx status " printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
"%02x, tx free %04x\n", inw(ioaddr+EL3_STATUS), "%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,7 +545,7 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd)
/* Read a word from the EEPROM using the regular EEPROM access register. /* Read a word from the EEPROM using the regular EEPROM access register.
Assume that we are in register window zero. Assume that we are in register window zero.
*/ */
static unsigned short read_eeprom(kio_addr_t ioaddr, int index) static unsigned short read_eeprom(unsigned int ioaddr, int index)
{ {
int timer; int timer;
outw(EEPROM_Read + index, ioaddr + Wn0EepromCmd); outw(EEPROM_Read + index, ioaddr + Wn0EepromCmd);
...@@ -572,9 +573,9 @@ static unsigned short read_eeprom(kio_addr_t ioaddr, int index) ...@@ -572,9 +573,9 @@ static unsigned short read_eeprom(kio_addr_t ioaddr, int index)
/* Generate the preamble required for initial synchronization and /* Generate the preamble required for initial synchronization and
a few older transceivers. */ a few older transceivers. */
static void mdio_sync(kio_addr_t ioaddr, int bits) static void mdio_sync(unsigned int ioaddr, int bits)
{ {
kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
/* Establish sync by sending at least 32 logic ones. */ /* Establish sync by sending at least 32 logic ones. */
while (-- bits >= 0) { while (-- bits >= 0) {
...@@ -583,12 +584,12 @@ static void mdio_sync(kio_addr_t ioaddr, int bits) ...@@ -583,12 +584,12 @@ static void mdio_sync(kio_addr_t ioaddr, int bits)
} }
} }
static int mdio_read(kio_addr_t ioaddr, int phy_id, int location) static int mdio_read(unsigned int ioaddr, int phy_id, int location)
{ {
int i; int i;
int read_cmd = (0xf6 << 10) | (phy_id << 5) | location; int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
unsigned int retval = 0; unsigned int retval = 0;
kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
if (mii_preamble_required) if (mii_preamble_required)
mdio_sync(ioaddr, 32); mdio_sync(ioaddr, 32);
...@@ -608,10 +609,10 @@ static int mdio_read(kio_addr_t ioaddr, int phy_id, int location) ...@@ -608,10 +609,10 @@ static int mdio_read(kio_addr_t ioaddr, int phy_id, int location)
return (retval>>1) & 0xffff; return (retval>>1) & 0xffff;
} }
static void mdio_write(kio_addr_t ioaddr, int phy_id, int location, int value) static void mdio_write(unsigned int ioaddr, int phy_id, int location, int value)
{ {
int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value; int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value;
kio_addr_t mdio_addr = ioaddr + Wn4_PhysicalMgmt; unsigned int mdio_addr = ioaddr + Wn4_PhysicalMgmt;
int i; int i;
if (mii_preamble_required) if (mii_preamble_required)
...@@ -637,7 +638,7 @@ static void tc574_reset(struct net_device *dev) ...@@ -637,7 +638,7 @@ static void tc574_reset(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
int i; int i;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
tc574_wait_for_completion(dev, TotalReset|0x10); tc574_wait_for_completion(dev, TotalReset|0x10);
...@@ -741,7 +742,7 @@ static int el3_open(struct net_device *dev) ...@@ -741,7 +742,7 @@ static int el3_open(struct net_device *dev)
static void el3_tx_timeout(struct net_device *dev) static void el3_tx_timeout(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name); printk(KERN_NOTICE "%s: Transmit timed out!\n", dev->name);
dump_status(dev); dump_status(dev);
...@@ -756,7 +757,7 @@ static void el3_tx_timeout(struct net_device *dev) ...@@ -756,7 +757,7 @@ static void el3_tx_timeout(struct net_device *dev)
static void pop_tx_status(struct net_device *dev) static void pop_tx_status(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i; int i;
/* Clear the Tx status stack. */ /* Clear the Tx status stack. */
...@@ -779,7 +780,7 @@ static void pop_tx_status(struct net_device *dev) ...@@ -779,7 +780,7 @@ static void pop_tx_status(struct net_device *dev)
static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
...@@ -813,7 +814,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) ...@@ -813,7 +814,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
unsigned status; unsigned status;
int work_budget = max_interrupt_work; int work_budget = max_interrupt_work;
int handled = 0; int handled = 0;
...@@ -907,7 +908,7 @@ static void media_check(unsigned long arg) ...@@ -907,7 +908,7 @@ static void media_check(unsigned long arg)
{ {
struct net_device *dev = (struct net_device *) arg; struct net_device *dev = (struct net_device *) arg;
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
unsigned short /* cable, */ media, partner; unsigned short /* cable, */ media, partner;
...@@ -996,7 +997,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev) ...@@ -996,7 +997,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
static void update_stats(struct net_device *dev) static void update_stats(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u8 rx, tx, up; u8 rx, tx, up;
DEBUG(2, "%s: updating the statistics.\n", dev->name); DEBUG(2, "%s: updating the statistics.\n", dev->name);
...@@ -1033,7 +1034,7 @@ static void update_stats(struct net_device *dev) ...@@ -1033,7 +1034,7 @@ static void update_stats(struct net_device *dev)
static int el3_rx(struct net_device *dev, int worklimit) static int el3_rx(struct net_device *dev, int worklimit)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
short rx_status; short rx_status;
DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n", 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 = { ...@@ -1094,7 +1095,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 *data = (u16 *)&rq->ifr_ifru; u16 *data = (u16 *)&rq->ifr_ifru;
int phy = lp->phys & 0x1f; int phy = lp->phys & 0x1f;
...@@ -1148,7 +1149,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1148,7 +1149,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
static void set_rx_mode(struct net_device *dev) static void set_rx_mode(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm, outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm,
...@@ -1161,7 +1162,7 @@ static void set_rx_mode(struct net_device *dev) ...@@ -1161,7 +1162,7 @@ static void set_rx_mode(struct net_device *dev)
static int el3_close(struct net_device *dev) static int el3_close(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
......
drivers/net/pcmcia/3c589_cs.c
浏览文件 @ 906da809
...@@ -145,7 +145,7 @@ DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)"; ...@@ -145,7 +145,7 @@ DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)";
static int tc589_config(struct pcmcia_device *link); static int tc589_config(struct pcmcia_device *link);
static void tc589_release(struct pcmcia_device *link); static void tc589_release(struct pcmcia_device *link);
static u16 read_eeprom(kio_addr_t ioaddr, int index); static u16 read_eeprom(unsigned int ioaddr, int index);
static void tc589_reset(struct net_device *dev); static void tc589_reset(struct net_device *dev);
static void media_check(unsigned long arg); static void media_check(unsigned long arg);
static int el3_config(struct net_device *dev, struct ifmap *map); static int el3_config(struct net_device *dev, struct ifmap *map);
...@@ -254,7 +254,7 @@ static int tc589_config(struct pcmcia_device *link) ...@@ -254,7 +254,7 @@ static int tc589_config(struct pcmcia_device *link)
__le16 buf[32]; __le16 buf[32];
__be16 *phys_addr; __be16 *phys_addr;
int last_fn, last_ret, i, j, multi = 0, fifo; int last_fn, last_ret, i, j, multi = 0, fifo;
kio_addr_t ioaddr; unsigned int ioaddr;
char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
...@@ -403,7 +403,7 @@ static void tc589_wait_for_completion(struct net_device *dev, int cmd) ...@@ -403,7 +403,7 @@ static void tc589_wait_for_completion(struct net_device *dev, int cmd)
Read a word from the EEPROM using the regular EEPROM access register. Read a word from the EEPROM using the regular EEPROM access register.
Assume that we are in register window zero. Assume that we are in register window zero.
*/ */
static u16 read_eeprom(kio_addr_t ioaddr, int index) static u16 read_eeprom(unsigned int ioaddr, int index)
{ {
int i; int i;
outw(EEPROM_READ + index, ioaddr + 10); outw(EEPROM_READ + index, ioaddr + 10);
...@@ -421,7 +421,7 @@ static u16 read_eeprom(kio_addr_t ioaddr, int index) ...@@ -421,7 +421,7 @@ static u16 read_eeprom(kio_addr_t ioaddr, int index)
static void tc589_set_xcvr(struct net_device *dev, int if_port) static void tc589_set_xcvr(struct net_device *dev, int if_port)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
EL3WINDOW(0); EL3WINDOW(0);
switch (if_port) { switch (if_port) {
...@@ -443,7 +443,7 @@ static void tc589_set_xcvr(struct net_device *dev, int if_port) ...@@ -443,7 +443,7 @@ static void tc589_set_xcvr(struct net_device *dev, int if_port)
static void dump_status(struct net_device *dev) static void dump_status(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
EL3WINDOW(1); EL3WINDOW(1);
printk(KERN_INFO " irq status %04x, rx status %04x, tx status " printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
"%02x tx free %04x\n", inw(ioaddr+EL3_STATUS), "%02x tx free %04x\n", inw(ioaddr+EL3_STATUS),
...@@ -459,7 +459,7 @@ static void dump_status(struct net_device *dev) ...@@ -459,7 +459,7 @@ static void dump_status(struct net_device *dev)
/* Reset and restore all of the 3c589 registers. */ /* Reset and restore all of the 3c589 registers. */
static void tc589_reset(struct net_device *dev) static void tc589_reset(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i; int i;
EL3WINDOW(0); EL3WINDOW(0);
...@@ -567,7 +567,7 @@ static int el3_open(struct net_device *dev) ...@@ -567,7 +567,7 @@ static int el3_open(struct net_device *dev)
static void el3_tx_timeout(struct net_device *dev) static void el3_tx_timeout(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name); printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name);
dump_status(dev); dump_status(dev);
...@@ -582,7 +582,7 @@ static void el3_tx_timeout(struct net_device *dev) ...@@ -582,7 +582,7 @@ static void el3_tx_timeout(struct net_device *dev)
static void pop_tx_status(struct net_device *dev) static void pop_tx_status(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i; int i;
/* Clear the Tx status stack. */ /* Clear the Tx status stack. */
...@@ -604,7 +604,7 @@ static void pop_tx_status(struct net_device *dev) ...@@ -604,7 +604,7 @@ static void pop_tx_status(struct net_device *dev)
static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct el3_private *priv = netdev_priv(dev); struct el3_private *priv = netdev_priv(dev);
unsigned long flags; unsigned long flags;
...@@ -641,7 +641,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id) ...@@ -641,7 +641,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
__u16 status; __u16 status;
int i = 0, handled = 1; int i = 0, handled = 1;
...@@ -727,7 +727,7 @@ static void media_check(unsigned long arg) ...@@ -727,7 +727,7 @@ static void media_check(unsigned long arg)
{ {
struct net_device *dev = (struct net_device *)(arg); struct net_device *dev = (struct net_device *)(arg);
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 media, errs; u16 media, errs;
unsigned long flags; unsigned long flags;
...@@ -828,7 +828,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev) ...@@ -828,7 +828,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
static void update_stats(struct net_device *dev) static void update_stats(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
DEBUG(2, "%s: updating the statistics.\n", dev->name); DEBUG(2, "%s: updating the statistics.\n", dev->name);
/* Turn off statistics updates while reading. */ /* Turn off statistics updates while reading. */
...@@ -855,7 +855,7 @@ static void update_stats(struct net_device *dev) ...@@ -855,7 +855,7 @@ static void update_stats(struct net_device *dev)
static int el3_rx(struct net_device *dev) static int el3_rx(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int worklimit = 32; int worklimit = 32;
short rx_status; short rx_status;
...@@ -909,7 +909,7 @@ static void set_multicast_list(struct net_device *dev) ...@@ -909,7 +909,7 @@ static void set_multicast_list(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 opts = SetRxFilter | RxStation | RxBroadcast; u16 opts = SetRxFilter | RxStation | RxBroadcast;
if (!pcmcia_dev_present(link)) return; if (!pcmcia_dev_present(link)) return;
...@@ -924,7 +924,7 @@ static int el3_close(struct net_device *dev) ...@@ -924,7 +924,7 @@ static int el3_close(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
DEBUG(1, "%s: shutting down ethercard.\n", dev->name); DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
......
drivers/net/pcmcia/axnet_cs.c
浏览文件 @ 906da809
...@@ -96,8 +96,8 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id); ...@@ -96,8 +96,8 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id);
static void ei_watchdog(u_long arg); static void ei_watchdog(u_long arg);
static void axnet_reset_8390(struct net_device *dev); static void axnet_reset_8390(struct net_device *dev);
static int mdio_read(kio_addr_t addr, int phy_id, int loc); static int mdio_read(unsigned int addr, int phy_id, int loc);
static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value); static void mdio_write(unsigned int addr, int phy_id, int loc, int value);
static void get_8390_hdr(struct net_device *, static void get_8390_hdr(struct net_device *,
struct e8390_pkt_hdr *, int); struct e8390_pkt_hdr *, int);
...@@ -203,7 +203,7 @@ static void axnet_detach(struct pcmcia_device *link) ...@@ -203,7 +203,7 @@ static void axnet_detach(struct pcmcia_device *link)
static int get_prom(struct pcmcia_device *link) static int get_prom(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i, j; int i, j;
/* This is based on drivers/net/ne.c */ /* This is based on drivers/net/ne.c */
...@@ -473,7 +473,7 @@ static int axnet_resume(struct pcmcia_device *link) ...@@ -473,7 +473,7 @@ static int axnet_resume(struct pcmcia_device *link)
#define MDIO_MASK 0x0f #define MDIO_MASK 0x0f
#define MDIO_ENB_IN 0x02 #define MDIO_ENB_IN 0x02
static void mdio_sync(kio_addr_t addr) static void mdio_sync(unsigned int addr)
{ {
int bits; int bits;
for (bits = 0; bits < 32; bits++) { for (bits = 0; bits < 32; bits++) {
...@@ -482,7 +482,7 @@ static void mdio_sync(kio_addr_t addr) ...@@ -482,7 +482,7 @@ static void mdio_sync(kio_addr_t addr)
} }
} }
static int mdio_read(kio_addr_t addr, int phy_id, int loc) static int mdio_read(unsigned int addr, int phy_id, int loc)
{ {
u_int cmd = (0xf6<<10)|(phy_id<<5)|loc; u_int cmd = (0xf6<<10)|(phy_id<<5)|loc;
int i, retval = 0; int i, retval = 0;
...@@ -501,7 +501,7 @@ static int mdio_read(kio_addr_t addr, int phy_id, int loc) ...@@ -501,7 +501,7 @@ static int mdio_read(kio_addr_t addr, int phy_id, int loc)
return (retval>>1) & 0xffff; return (retval>>1) & 0xffff;
} }
static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value) static void mdio_write(unsigned int addr, int phy_id, int loc, int value)
{ {
u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
int i; int i;
...@@ -575,7 +575,7 @@ static int axnet_close(struct net_device *dev) ...@@ -575,7 +575,7 @@ static int axnet_close(struct net_device *dev)
static void axnet_reset_8390(struct net_device *dev) static void axnet_reset_8390(struct net_device *dev)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
int i; int i;
ei_status.txing = ei_status.dmaing = 0; ei_status.txing = ei_status.dmaing = 0;
...@@ -610,8 +610,8 @@ static void ei_watchdog(u_long arg) ...@@ -610,8 +610,8 @@ static void ei_watchdog(u_long arg)
{ {
struct net_device *dev = (struct net_device *)(arg); struct net_device *dev = (struct net_device *)(arg);
axnet_dev_t *info = PRIV(dev); axnet_dev_t *info = PRIV(dev);
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
kio_addr_t mii_addr = nic_base + AXNET_MII_EEP; unsigned int mii_addr = nic_base + AXNET_MII_EEP;
u_short link; u_short link;
if (!netif_device_present(dev)) goto reschedule; 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,7 +681,7 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
axnet_dev_t *info = PRIV(dev); axnet_dev_t *info = PRIV(dev);
u16 *data = (u16 *)&rq->ifr_ifru; u16 *data = (u16 *)&rq->ifr_ifru;
kio_addr_t mii_addr = dev->base_addr + AXNET_MII_EEP; unsigned int mii_addr = dev->base_addr + AXNET_MII_EEP;
switch (cmd) { switch (cmd) {
case SIOCGMIIPHY: case SIOCGMIIPHY:
data[0] = info->phy_id; data[0] = info->phy_id;
...@@ -703,7 +703,7 @@ static void get_8390_hdr(struct net_device *dev, ...@@ -703,7 +703,7 @@ static void get_8390_hdr(struct net_device *dev,
struct e8390_pkt_hdr *hdr, struct e8390_pkt_hdr *hdr,
int ring_page) int ring_page)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
outb_p(0, nic_base + EN0_RSARLO); /* On page boundary */ outb_p(0, nic_base + EN0_RSARLO); /* On page boundary */
outb_p(ring_page, nic_base + EN0_RSARHI); outb_p(ring_page, nic_base + EN0_RSARHI);
...@@ -721,7 +721,7 @@ static void get_8390_hdr(struct net_device *dev, ...@@ -721,7 +721,7 @@ static void get_8390_hdr(struct net_device *dev,
static void block_input(struct net_device *dev, int count, static void block_input(struct net_device *dev, int count,
struct sk_buff *skb, int ring_offset) struct sk_buff *skb, int ring_offset)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
int xfer_count = count; int xfer_count = count;
char *buf = skb->data; char *buf = skb->data;
...@@ -744,7 +744,7 @@ static void block_input(struct net_device *dev, int count, ...@@ -744,7 +744,7 @@ static void block_input(struct net_device *dev, int count,
static void block_output(struct net_device *dev, int count, static void block_output(struct net_device *dev, int count,
const u_char *buf, const int start_page) const u_char *buf, const int start_page)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
#ifdef PCMCIA_DEBUG #ifdef PCMCIA_DEBUG
if (ei_debug > 4) if (ei_debug > 4)
......
drivers/net/pcmcia/fmvj18x_cs.c
浏览文件 @ 906da809
...@@ -298,7 +298,8 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) ...@@ -298,7 +298,8 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static int mfc_try_io_port(struct pcmcia_device *link) static int mfc_try_io_port(struct pcmcia_device *link)
{ {
int i, ret; int i, ret;
static const kio_addr_t serial_base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; static const unsigned int serial_base[5] =
{ 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
link->io.BasePort2 = serial_base[i]; link->io.BasePort2 = serial_base[i];
...@@ -316,7 +317,7 @@ static int mfc_try_io_port(struct pcmcia_device *link) ...@@ -316,7 +317,7 @@ static int mfc_try_io_port(struct pcmcia_device *link)
static int ungermann_try_io_port(struct pcmcia_device *link) static int ungermann_try_io_port(struct pcmcia_device *link)
{ {
int ret; int ret;
kio_addr_t ioaddr; unsigned int ioaddr;
/* /*
Ungermann-Bass Access/CARD accepts 0x300,0x320,0x340,0x360 Ungermann-Bass Access/CARD accepts 0x300,0x320,0x340,0x360
0x380,0x3c0 only for ioport. 0x380,0x3c0 only for ioport.
...@@ -342,7 +343,7 @@ static int fmvj18x_config(struct pcmcia_device *link) ...@@ -342,7 +343,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
cisparse_t parse; cisparse_t parse;
u_short buf[32]; u_short buf[32];
int i, last_fn = 0, last_ret = 0, ret; int i, last_fn = 0, last_ret = 0, ret;
kio_addr_t ioaddr; unsigned int ioaddr;
cardtype_t cardtype; cardtype_t cardtype;
char *card_name = "unknown"; char *card_name = "unknown";
u_char *node_id; u_char *node_id;
...@@ -610,7 +611,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) ...@@ -610,7 +611,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
u_char __iomem *base; u_char __iomem *base;
int i, j; int i, j;
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr; unsigned int ioaddr;
/* Allocate a small memory window */ /* Allocate a small memory window */
req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; 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,7 +736,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
local_info_t *lp = netdev_priv(dev); local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
unsigned short tx_stat, rx_stat; unsigned short tx_stat, rx_stat;
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
...@@ -789,7 +790,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id) ...@@ -789,7 +790,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id)
static void fjn_tx_timeout(struct net_device *dev) static void fjn_tx_timeout(struct net_device *dev)
{ {
struct local_info_t *lp = netdev_priv(dev); struct local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
printk(KERN_NOTICE "%s: transmit timed out with status %04x, %s?\n", printk(KERN_NOTICE "%s: transmit timed out with status %04x, %s?\n",
dev->name, htons(inw(ioaddr + TX_STATUS)), dev->name, htons(inw(ioaddr + TX_STATUS)),
...@@ -819,7 +820,7 @@ static void fjn_tx_timeout(struct net_device *dev) ...@@ -819,7 +820,7 @@ static void fjn_tx_timeout(struct net_device *dev)
static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct local_info_t *lp = netdev_priv(dev); struct local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
short length = skb->len; short length = skb->len;
if (length < ETH_ZLEN) if (length < ETH_ZLEN)
...@@ -892,7 +893,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -892,7 +893,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)
static void fjn_reset(struct net_device *dev) static void fjn_reset(struct net_device *dev)
{ {
struct local_info_t *lp = netdev_priv(dev); struct local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i; int i;
DEBUG(4, "fjn_reset(%s) called.\n",dev->name); DEBUG(4, "fjn_reset(%s) called.\n",dev->name);
...@@ -971,7 +972,7 @@ static void fjn_reset(struct net_device *dev) ...@@ -971,7 +972,7 @@ static void fjn_reset(struct net_device *dev)
static void fjn_rx(struct net_device *dev) static void fjn_rx(struct net_device *dev)
{ {
struct local_info_t *lp = netdev_priv(dev); struct local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int boguscount = 10; /* 5 -> 10: by agy 19940922 */ int boguscount = 10; /* 5 -> 10: by agy 19940922 */
DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n", DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n",
...@@ -1125,7 +1126,7 @@ static int fjn_close(struct net_device *dev) ...@@ -1125,7 +1126,7 @@ static int fjn_close(struct net_device *dev)
{ {
struct local_info_t *lp = netdev_priv(dev); struct local_info_t *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
DEBUG(4, "fjn_close('%s').\n", dev->name); DEBUG(4, "fjn_close('%s').\n", dev->name);
...@@ -1168,7 +1169,7 @@ static struct net_device_stats *fjn_get_stats(struct net_device *dev) ...@@ -1168,7 +1169,7 @@ static struct net_device_stats *fjn_get_stats(struct net_device *dev)
static void set_rx_mode(struct net_device *dev) static void set_rx_mode(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_char mc_filter[8]; /* Multicast hash filter */ u_char mc_filter[8]; /* Multicast hash filter */
u_long flags; u_long flags;
int i; int i;
......
drivers/net/pcmcia/nmclan_cs.c
浏览文件 @ 906da809
...@@ -518,7 +518,7 @@ mace_read ...@@ -518,7 +518,7 @@ mace_read
assuming that during normal operation, the MACE is always in assuming that during normal operation, the MACE is always in
bank 0. bank 0.
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static int mace_read(mace_private *lp, kio_addr_t ioaddr, int reg) static int mace_read(mace_private *lp, unsigned int ioaddr, int reg)
{ {
int data = 0xFF; int data = 0xFF;
unsigned long flags; unsigned long flags;
...@@ -545,7 +545,8 @@ mace_write ...@@ -545,7 +545,8 @@ mace_write
are assuming that during normal operation, the MACE is always in are assuming that during normal operation, the MACE is always in
bank 0. bank 0.
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data) static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,
int data)
{ {
unsigned long flags; unsigned long flags;
...@@ -567,7 +568,7 @@ static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data) ...@@ -567,7 +568,7 @@ static void mace_write(mace_private *lp, kio_addr_t ioaddr, int reg, int data)
mace_init mace_init
Resets the MACE chip. Resets the MACE chip.
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static int mace_init(mace_private *lp, kio_addr_t ioaddr, char *enet_addr) static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)
{ {
int i; int i;
int ct = 0; int ct = 0;
...@@ -657,7 +658,7 @@ static int nmclan_config(struct pcmcia_device *link) ...@@ -657,7 +658,7 @@ static int nmclan_config(struct pcmcia_device *link)
tuple_t tuple; tuple_t tuple;
u_char buf[64]; u_char buf[64];
int i, last_ret, last_fn; int i, last_ret, last_fn;
kio_addr_t ioaddr; unsigned int ioaddr;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
DEBUG(0, "nmclan_config(0x%p)\n", link); DEBUG(0, "nmclan_config(0x%p)\n", link);
...@@ -839,7 +840,7 @@ mace_open ...@@ -839,7 +840,7 @@ mace_open
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static int mace_open(struct net_device *dev) static int mace_open(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
...@@ -862,7 +863,7 @@ mace_close ...@@ -862,7 +863,7 @@ mace_close
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static int mace_close(struct net_device *dev) static int mace_close(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
...@@ -935,7 +936,7 @@ static void mace_tx_timeout(struct net_device *dev) ...@@ -935,7 +936,7 @@ static void mace_tx_timeout(struct net_device *dev)
static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -996,7 +997,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) ...@@ -996,7 +997,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
int status; int status;
int IntrCnt = MACE_MAX_IR_ITERATIONS; int IntrCnt = MACE_MAX_IR_ITERATIONS;
...@@ -1140,7 +1141,7 @@ mace_rx ...@@ -1140,7 +1141,7 @@ mace_rx
static int mace_rx(struct net_device *dev, unsigned char RxCnt) static int mace_rx(struct net_device *dev, unsigned char RxCnt)
{ {
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned char rx_framecnt; unsigned char rx_framecnt;
unsigned short rx_status; unsigned short rx_status;
...@@ -1302,7 +1303,7 @@ update_stats ...@@ -1302,7 +1303,7 @@ update_stats
card's SRAM fast enough. If this happens, something is card's SRAM fast enough. If this happens, something is
seriously wrong with the hardware. seriously wrong with the hardware.
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static void update_stats(kio_addr_t ioaddr, struct net_device *dev) static void update_stats(unsigned int ioaddr, struct net_device *dev)
{ {
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
...@@ -1448,7 +1449,7 @@ static void restore_multicast_list(struct net_device *dev) ...@@ -1448,7 +1449,7 @@ static void restore_multicast_list(struct net_device *dev)
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
int num_addrs = lp->multicast_num_addrs; int num_addrs = lp->multicast_num_addrs;
int *ladrf = lp->multicast_ladrf; int *ladrf = lp->multicast_ladrf;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i; int i;
DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", DEBUG(2, "%s: restoring Rx mode to %d addresses.\n",
...@@ -1540,7 +1541,7 @@ static void set_multicast_list(struct net_device *dev) ...@@ -1540,7 +1541,7 @@ static void set_multicast_list(struct net_device *dev)
static void restore_multicast_list(struct net_device *dev) static void restore_multicast_list(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
mace_private *lp = netdev_priv(dev); mace_private *lp = netdev_priv(dev);
DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name, DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name,
......
drivers/net/pcmcia/pcnet_cs.c
浏览文件 @ 906da809
...@@ -349,7 +349,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link) ...@@ -349,7 +349,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
static hw_info_t *get_prom(struct pcmcia_device *link) static hw_info_t *get_prom(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_char prom[32]; u_char prom[32];
int i, j; int i, j;
...@@ -425,7 +425,7 @@ static hw_info_t *get_dl10019(struct pcmcia_device *link) ...@@ -425,7 +425,7 @@ static hw_info_t *get_dl10019(struct pcmcia_device *link)
static hw_info_t *get_ax88190(struct pcmcia_device *link) static hw_info_t *get_ax88190(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i, j; int i, j;
/* Not much of a test, but the alternatives are messy */ /* Not much of a test, but the alternatives are messy */
...@@ -756,7 +756,7 @@ static int pcnet_resume(struct pcmcia_device *link) ...@@ -756,7 +756,7 @@ static int pcnet_resume(struct pcmcia_device *link)
#define MDIO_DATA_READ 0x10 #define MDIO_DATA_READ 0x10
#define MDIO_MASK 0x0f #define MDIO_MASK 0x0f
static void mdio_sync(kio_addr_t addr) static void mdio_sync(unsigned int addr)
{ {
int bits, mask = inb(addr) & MDIO_MASK; int bits, mask = inb(addr) & MDIO_MASK;
for (bits = 0; bits < 32; bits++) { for (bits = 0; bits < 32; bits++) {
...@@ -765,7 +765,7 @@ static void mdio_sync(kio_addr_t addr) ...@@ -765,7 +765,7 @@ static void mdio_sync(kio_addr_t addr)
} }
} }
static int mdio_read(kio_addr_t addr, int phy_id, int loc) static int mdio_read(unsigned int addr, int phy_id, int loc)
{ {
u_int cmd = (0x06<<10)|(phy_id<<5)|loc; u_int cmd = (0x06<<10)|(phy_id<<5)|loc;
int i, retval = 0, mask = inb(addr) & MDIO_MASK; 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,7 +784,7 @@ static int mdio_read(kio_addr_t addr, int phy_id, int loc)
return (retval>>1) & 0xffff; return (retval>>1) & 0xffff;
} }
static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value) static void mdio_write(unsigned int addr, int phy_id, int loc, int value)
{ {
u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
int i, mask = inb(addr) & MDIO_MASK; 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,10 +818,10 @@ static void mdio_write(kio_addr_t addr, int phy_id, int loc, int value)
#define DL19FDUPLX 0x0400 /* DL10019 Full duplex mode */ #define DL19FDUPLX 0x0400 /* DL10019 Full duplex mode */
static int read_eeprom(kio_addr_t ioaddr, int location) static int read_eeprom(unsigned int ioaddr, int location)
{ {
int i, retval = 0; int i, retval = 0;
kio_addr_t ee_addr = ioaddr + DLINK_EEPROM; unsigned int ee_addr = ioaddr + DLINK_EEPROM;
int read_cmd = location | (EE_READ_CMD << 8); int read_cmd = location | (EE_READ_CMD << 8);
outb(0, ee_addr); outb(0, ee_addr);
...@@ -852,10 +852,10 @@ static int read_eeprom(kio_addr_t ioaddr, int location) ...@@ -852,10 +852,10 @@ static int read_eeprom(kio_addr_t ioaddr, int location)
In ASIC mode, EE_ADOT is used to output the data to the ASIC. In ASIC mode, EE_ADOT is used to output the data to the ASIC.
*/ */
static void write_asic(kio_addr_t ioaddr, int location, short asic_data) static void write_asic(unsigned int ioaddr, int location, short asic_data)
{ {
int i; int i;
kio_addr_t ee_addr = ioaddr + DLINK_EEPROM; unsigned int ee_addr = ioaddr + DLINK_EEPROM;
short dataval; short dataval;
int read_cmd = location | (EE_READ_CMD << 8); int read_cmd = location | (EE_READ_CMD << 8);
...@@ -897,7 +897,7 @@ static void write_asic(kio_addr_t ioaddr, int location, short asic_data) ...@@ -897,7 +897,7 @@ static void write_asic(kio_addr_t ioaddr, int location, short asic_data)
static void set_misc_reg(struct net_device *dev) static void set_misc_reg(struct net_device *dev)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
pcnet_dev_t *info = PRIV(dev); pcnet_dev_t *info = PRIV(dev);
u_char tmp; u_char tmp;
...@@ -936,7 +936,7 @@ static void set_misc_reg(struct net_device *dev) ...@@ -936,7 +936,7 @@ static void set_misc_reg(struct net_device *dev)
static void mii_phy_probe(struct net_device *dev) static void mii_phy_probe(struct net_device *dev)
{ {
pcnet_dev_t *info = PRIV(dev); pcnet_dev_t *info = PRIV(dev);
kio_addr_t mii_addr = dev->base_addr + DLINK_GPIO; unsigned int mii_addr = dev->base_addr + DLINK_GPIO;
int i; int i;
u_int tmp, phyid; u_int tmp, phyid;
...@@ -1014,7 +1014,7 @@ static int pcnet_close(struct net_device *dev) ...@@ -1014,7 +1014,7 @@ static int pcnet_close(struct net_device *dev)
static void pcnet_reset_8390(struct net_device *dev) static void pcnet_reset_8390(struct net_device *dev)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
int i; int i;
ei_status.txing = ei_status.dmaing = 0; ei_status.txing = ei_status.dmaing = 0;
...@@ -1074,8 +1074,8 @@ static void ei_watchdog(u_long arg) ...@@ -1074,8 +1074,8 @@ static void ei_watchdog(u_long arg)
{ {
struct net_device *dev = (struct net_device *)arg; struct net_device *dev = (struct net_device *)arg;
pcnet_dev_t *info = PRIV(dev); pcnet_dev_t *info = PRIV(dev);
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
kio_addr_t mii_addr = nic_base + DLINK_GPIO; unsigned int mii_addr = nic_base + DLINK_GPIO;
u_short link; u_short link;
if (!netif_device_present(dev)) goto reschedule; 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,7 +1177,7 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
pcnet_dev_t *info = PRIV(dev); pcnet_dev_t *info = PRIV(dev);
u16 *data = (u16 *)&rq->ifr_ifru; u16 *data = (u16 *)&rq->ifr_ifru;
kio_addr_t mii_addr = dev->base_addr + DLINK_GPIO; unsigned int mii_addr = dev->base_addr + DLINK_GPIO;
switch (cmd) { switch (cmd) {
case SIOCGMIIPHY: case SIOCGMIIPHY:
data[0] = info->phy_id; data[0] = info->phy_id;
...@@ -1199,7 +1199,7 @@ static void dma_get_8390_hdr(struct net_device *dev, ...@@ -1199,7 +1199,7 @@ static void dma_get_8390_hdr(struct net_device *dev,
struct e8390_pkt_hdr *hdr, struct e8390_pkt_hdr *hdr,
int ring_page) int ring_page)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
if (ei_status.dmaing) { if (ei_status.dmaing) {
printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input." printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input."
...@@ -1230,7 +1230,7 @@ static void dma_get_8390_hdr(struct net_device *dev, ...@@ -1230,7 +1230,7 @@ static void dma_get_8390_hdr(struct net_device *dev,
static void dma_block_input(struct net_device *dev, int count, static void dma_block_input(struct net_device *dev, int count,
struct sk_buff *skb, int ring_offset) struct sk_buff *skb, int ring_offset)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
int xfer_count = count; int xfer_count = count;
char *buf = skb->data; char *buf = skb->data;
...@@ -1285,7 +1285,7 @@ static void dma_block_input(struct net_device *dev, int count, ...@@ -1285,7 +1285,7 @@ static void dma_block_input(struct net_device *dev, int count,
static void dma_block_output(struct net_device *dev, int count, static void dma_block_output(struct net_device *dev, int count,
const u_char *buf, const int start_page) const u_char *buf, const int start_page)
{ {
kio_addr_t nic_base = dev->base_addr; unsigned int nic_base = dev->base_addr;
pcnet_dev_t *info = PRIV(dev); pcnet_dev_t *info = PRIV(dev);
#ifdef PCMCIA_DEBUG #ifdef PCMCIA_DEBUG
int retries = 0; int retries = 0;
......
drivers/net/pcmcia/smc91c92_cs.c
浏览文件 @ 906da809
...@@ -295,7 +295,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map); ...@@ -295,7 +295,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map);
static void smc_set_xcvr(struct net_device *dev, int if_port); static void smc_set_xcvr(struct net_device *dev, int if_port);
static void smc_reset(struct net_device *dev); static void smc_reset(struct net_device *dev);
static void media_check(u_long arg); static void media_check(u_long arg);
static void mdio_sync(kio_addr_t addr); static void mdio_sync(unsigned int addr);
static int mdio_read(struct net_device *dev, int phy_id, int loc); static int mdio_read(struct net_device *dev, int phy_id, int loc);
static void mdio_write(struct net_device *dev, int phy_id, int loc, int value); static void mdio_write(struct net_device *dev, int phy_id, int loc, int value);
static int smc_link_ok(struct net_device *dev); static int smc_link_ok(struct net_device *dev);
...@@ -601,8 +601,8 @@ static void mot_config(struct pcmcia_device *link) ...@@ -601,8 +601,8 @@ static void mot_config(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
kio_addr_t iouart = link->io.BasePort2; unsigned int iouart = link->io.BasePort2;
/* Set UART base address and force map with COR bit 1 */ /* Set UART base address and force map with COR bit 1 */
writeb(iouart & 0xff, smc->base + MOT_UART + CISREG_IOBASE_0); writeb(iouart & 0xff, smc->base + MOT_UART + CISREG_IOBASE_0);
...@@ -621,7 +621,7 @@ static void mot_config(struct pcmcia_device *link) ...@@ -621,7 +621,7 @@ static void mot_config(struct pcmcia_device *link)
static int mot_setup(struct pcmcia_device *link) static int mot_setup(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int i, wait, loop; int i, wait, loop;
u_int addr; u_int addr;
...@@ -754,7 +754,7 @@ static int smc_setup(struct pcmcia_device *link) ...@@ -754,7 +754,7 @@ static int smc_setup(struct pcmcia_device *link)
static int osi_config(struct pcmcia_device *link) static int osi_config(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
static const kio_addr_t com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; static const unsigned int com[4] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
int i, j; int i, j;
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
...@@ -900,7 +900,7 @@ static int smc91c92_resume(struct pcmcia_device *link) ...@@ -900,7 +900,7 @@ static int smc91c92_resume(struct pcmcia_device *link)
static int check_sig(struct pcmcia_device *link) static int check_sig(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int width; int width;
u_short s; u_short s;
...@@ -960,7 +960,7 @@ static int smc91c92_config(struct pcmcia_device *link) ...@@ -960,7 +960,7 @@ static int smc91c92_config(struct pcmcia_device *link)
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
char *name; char *name;
int i, j, rev; int i, j, rev;
kio_addr_t ioaddr; unsigned int ioaddr;
u_long mir; u_long mir;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
...@@ -1136,7 +1136,7 @@ static void smc91c92_release(struct pcmcia_device *link) ...@@ -1136,7 +1136,7 @@ static void smc91c92_release(struct pcmcia_device *link)
#define MDIO_DATA_WRITE1 (MDIO_DIR_WRITE | MDIO_DATA_OUT) #define MDIO_DATA_WRITE1 (MDIO_DIR_WRITE | MDIO_DATA_OUT)
#define MDIO_DATA_READ 0x02 #define MDIO_DATA_READ 0x02
static void mdio_sync(kio_addr_t addr) static void mdio_sync(unsigned int addr)
{ {
int bits; int bits;
for (bits = 0; bits < 32; bits++) { for (bits = 0; bits < 32; bits++) {
...@@ -1147,7 +1147,7 @@ static void mdio_sync(kio_addr_t addr) ...@@ -1147,7 +1147,7 @@ static void mdio_sync(kio_addr_t addr)
static int mdio_read(struct net_device *dev, int phy_id, int loc) static int mdio_read(struct net_device *dev, int phy_id, int loc)
{ {
kio_addr_t addr = dev->base_addr + MGMT; unsigned int addr = dev->base_addr + MGMT;
u_int cmd = (0x06<<10)|(phy_id<<5)|loc; u_int cmd = (0x06<<10)|(phy_id<<5)|loc;
int i, retval = 0; int i, retval = 0;
...@@ -1167,7 +1167,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc) ...@@ -1167,7 +1167,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
static void mdio_write(struct net_device *dev, int phy_id, int loc, int value) static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
{ {
kio_addr_t addr = dev->base_addr + MGMT; unsigned int addr = dev->base_addr + MGMT;
u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value; u_int cmd = (0x05<<28)|(phy_id<<23)|(loc<<18)|(1<<17)|value;
int i; int i;
...@@ -1193,7 +1193,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value) ...@@ -1193,7 +1193,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
#ifdef PCMCIA_DEBUG #ifdef PCMCIA_DEBUG
static void smc_dump(struct net_device *dev) static void smc_dump(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_short i, w, save; u_short i, w, save;
save = inw(ioaddr + BANK_SELECT); save = inw(ioaddr + BANK_SELECT);
for (w = 0; w < 4; w++) { for (w = 0; w < 4; w++) {
...@@ -1248,7 +1248,7 @@ static int smc_close(struct net_device *dev) ...@@ -1248,7 +1248,7 @@ static int smc_close(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
struct pcmcia_device *link = smc->p_dev; struct pcmcia_device *link = smc->p_dev;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
DEBUG(0, "%s: smc_close(), status %4.4x.\n", DEBUG(0, "%s: smc_close(), status %4.4x.\n",
dev->name, inw(ioaddr + BANK_SELECT)); dev->name, inw(ioaddr + BANK_SELECT));
...@@ -1285,7 +1285,7 @@ static void smc_hardware_send_packet(struct net_device * dev) ...@@ -1285,7 +1285,7 @@ static void smc_hardware_send_packet(struct net_device * dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
struct sk_buff *skb = smc->saved_skb; struct sk_buff *skb = smc->saved_skb;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_char packet_no; u_char packet_no;
if (!skb) { if (!skb) {
...@@ -1349,7 +1349,7 @@ static void smc_hardware_send_packet(struct net_device * dev) ...@@ -1349,7 +1349,7 @@ static void smc_hardware_send_packet(struct net_device * dev)
static void smc_tx_timeout(struct net_device *dev) static void smc_tx_timeout(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
printk(KERN_NOTICE "%s: SMC91c92 transmit timed out, " printk(KERN_NOTICE "%s: SMC91c92 transmit timed out, "
"Tx_status %2.2x status %4.4x.\n", "Tx_status %2.2x status %4.4x.\n",
...@@ -1364,7 +1364,7 @@ static void smc_tx_timeout(struct net_device *dev) ...@@ -1364,7 +1364,7 @@ static void smc_tx_timeout(struct net_device *dev)
static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_short num_pages; u_short num_pages;
short time_out, ir; short time_out, ir;
unsigned long flags; unsigned long flags;
...@@ -1434,7 +1434,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1434,7 +1434,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
static void smc_tx_err(struct net_device * dev) static void smc_tx_err(struct net_device * dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int saved_packet = inw(ioaddr + PNR_ARR) & 0xff; int saved_packet = inw(ioaddr + PNR_ARR) & 0xff;
int packet_no = inw(ioaddr + FIFO_PORTS) & 0x7f; int packet_no = inw(ioaddr + FIFO_PORTS) & 0x7f;
int tx_status; int tx_status;
...@@ -1478,7 +1478,7 @@ static void smc_tx_err(struct net_device * dev) ...@@ -1478,7 +1478,7 @@ static void smc_tx_err(struct net_device * dev)
static void smc_eph_irq(struct net_device *dev) static void smc_eph_irq(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_short card_stats, ephs; u_short card_stats, ephs;
SMC_SELECT_BANK(0); SMC_SELECT_BANK(0);
...@@ -1513,7 +1513,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) ...@@ -1513,7 +1513,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
u_short saved_bank, saved_pointer, mask, status; u_short saved_bank, saved_pointer, mask, status;
unsigned int handled = 1; unsigned int handled = 1;
char bogus_cnt = INTR_WORK; /* Work we are willing to do. */ char bogus_cnt = INTR_WORK; /* Work we are willing to do. */
...@@ -1633,7 +1633,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) ...@@ -1633,7 +1633,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
static void smc_rx(struct net_device *dev) static void smc_rx(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int rx_status; int rx_status;
int packet_length; /* Caution: not frame length, rather words int packet_length; /* Caution: not frame length, rather words
to transfer from the chip. */ to transfer from the chip. */
...@@ -1738,7 +1738,7 @@ static void fill_multicast_tbl(int count, struct dev_mc_list *addrs, ...@@ -1738,7 +1738,7 @@ static void fill_multicast_tbl(int count, struct dev_mc_list *addrs,
static void set_rx_mode(struct net_device *dev) static void set_rx_mode(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
u_int multicast_table[ 2 ] = { 0, }; u_int multicast_table[ 2 ] = { 0, };
unsigned long flags; unsigned long flags;
...@@ -1804,7 +1804,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map) ...@@ -1804,7 +1804,7 @@ static int s9k_config(struct net_device *dev, struct ifmap *map)
static void smc_set_xcvr(struct net_device *dev, int if_port) static void smc_set_xcvr(struct net_device *dev, int if_port)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_short saved_bank; u_short saved_bank;
saved_bank = inw(ioaddr + BANK_SELECT); saved_bank = inw(ioaddr + BANK_SELECT);
...@@ -1827,7 +1827,7 @@ static void smc_set_xcvr(struct net_device *dev, int if_port) ...@@ -1827,7 +1827,7 @@ static void smc_set_xcvr(struct net_device *dev, int if_port)
static void smc_reset(struct net_device *dev) static void smc_reset(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
int i; int i;
...@@ -1904,7 +1904,7 @@ static void media_check(u_long arg) ...@@ -1904,7 +1904,7 @@ static void media_check(u_long arg)
{ {
struct net_device *dev = (struct net_device *) arg; struct net_device *dev = (struct net_device *) arg;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u_short i, media, saved_bank; u_short i, media, saved_bank;
u_short link; u_short link;
unsigned long flags; unsigned long flags;
...@@ -2021,7 +2021,7 @@ static void media_check(u_long arg) ...@@ -2021,7 +2021,7 @@ static void media_check(u_long arg)
static int smc_link_ok(struct net_device *dev) static int smc_link_ok(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
if (smc->cfg & CFG_MII_SELECT) { if (smc->cfg & CFG_MII_SELECT) {
...@@ -2035,7 +2035,7 @@ static int smc_link_ok(struct net_device *dev) ...@@ -2035,7 +2035,7 @@ static int smc_link_ok(struct net_device *dev)
static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
{ {
u16 tmp; u16 tmp;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
ecmd->supported = (SUPPORTED_TP | SUPPORTED_AUI | ecmd->supported = (SUPPORTED_TP | SUPPORTED_AUI |
SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full); SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full);
...@@ -2057,7 +2057,7 @@ static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) ...@@ -2057,7 +2057,7 @@ static int smc_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
static int smc_netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd) static int smc_netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
{ {
u16 tmp; u16 tmp;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
if (ecmd->speed != SPEED_10) if (ecmd->speed != SPEED_10)
return -EINVAL; return -EINVAL;
...@@ -2100,7 +2100,7 @@ static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info ...@@ -2100,7 +2100,7 @@ static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 saved_bank = inw(ioaddr + BANK_SELECT); u16 saved_bank = inw(ioaddr + BANK_SELECT);
int ret; int ret;
...@@ -2118,7 +2118,7 @@ static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ...@@ -2118,7 +2118,7 @@ static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 saved_bank = inw(ioaddr + BANK_SELECT); u16 saved_bank = inw(ioaddr + BANK_SELECT);
int ret; int ret;
...@@ -2136,7 +2136,7 @@ static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ...@@ -2136,7 +2136,7 @@ static int smc_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
static u32 smc_get_link(struct net_device *dev) static u32 smc_get_link(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 saved_bank = inw(ioaddr + BANK_SELECT); u16 saved_bank = inw(ioaddr + BANK_SELECT);
u32 ret; u32 ret;
...@@ -2164,7 +2164,7 @@ static int smc_nway_reset(struct net_device *dev) ...@@ -2164,7 +2164,7 @@ static int smc_nway_reset(struct net_device *dev)
{ {
struct smc_private *smc = netdev_priv(dev); struct smc_private *smc = netdev_priv(dev);
if (smc->cfg & CFG_MII_SELECT) { if (smc->cfg & CFG_MII_SELECT) {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 saved_bank = inw(ioaddr + BANK_SELECT); u16 saved_bank = inw(ioaddr + BANK_SELECT);
int res; int res;
...@@ -2196,7 +2196,7 @@ static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2196,7 +2196,7 @@ static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
struct mii_ioctl_data *mii = if_mii(rq); struct mii_ioctl_data *mii = if_mii(rq);
int rc = 0; int rc = 0;
u16 saved_bank; u16 saved_bank;
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
if (!netif_running(dev)) if (!netif_running(dev))
return -EINVAL; return -EINVAL;
......
drivers/net/pcmcia/xirc2ps_cs.c
浏览文件 @ 906da809
...@@ -273,12 +273,12 @@ INT_MODULE_PARM(lockup_hack, 0); /* anti lockup hack */ ...@@ -273,12 +273,12 @@ INT_MODULE_PARM(lockup_hack, 0); /* anti lockup hack */
static unsigned maxrx_bytes = 22000; static unsigned maxrx_bytes = 22000;
/* MII management prototypes */ /* MII management prototypes */
static void mii_idle(kio_addr_t ioaddr); static void mii_idle(unsigned int ioaddr);
static void mii_putbit(kio_addr_t ioaddr, unsigned data); static void mii_putbit(unsigned int ioaddr, unsigned data);
static int mii_getbit(kio_addr_t ioaddr); static int mii_getbit(unsigned int ioaddr);
static void mii_wbits(kio_addr_t ioaddr, unsigned data, int len); static void mii_wbits(unsigned int ioaddr, unsigned data, int len);
static unsigned mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg); static unsigned mii_rd(unsigned int ioaddr, u_char phyaddr, u_char phyreg);
static void mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg, static void mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg,
unsigned data, int len); unsigned data, int len);
/* /*
...@@ -403,7 +403,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse) ...@@ -403,7 +403,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
static void static void
PrintRegisters(struct net_device *dev) PrintRegisters(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
if (pc_debug > 1) { if (pc_debug > 1) {
int i, page; int i, page;
...@@ -439,7 +439,7 @@ PrintRegisters(struct net_device *dev) ...@@ -439,7 +439,7 @@ PrintRegisters(struct net_device *dev)
* Turn around for read * Turn around for read
*/ */
static void static void
mii_idle(kio_addr_t ioaddr) mii_idle(unsigned int ioaddr)
{ {
PutByte(XIRCREG2_GPR2, 0x04|0); /* drive MDCK low */ PutByte(XIRCREG2_GPR2, 0x04|0); /* drive MDCK low */
udelay(1); udelay(1);
...@@ -451,7 +451,7 @@ mii_idle(kio_addr_t ioaddr) ...@@ -451,7 +451,7 @@ mii_idle(kio_addr_t ioaddr)
* Write a bit to MDI/O * Write a bit to MDI/O
*/ */
static void static void
mii_putbit(kio_addr_t ioaddr, unsigned data) mii_putbit(unsigned int ioaddr, unsigned data)
{ {
#if 1 #if 1
if (data) { if (data) {
...@@ -484,7 +484,7 @@ mii_putbit(kio_addr_t ioaddr, unsigned data) ...@@ -484,7 +484,7 @@ mii_putbit(kio_addr_t ioaddr, unsigned data)
* Get a bit from MDI/O * Get a bit from MDI/O
*/ */
static int static int
mii_getbit(kio_addr_t ioaddr) mii_getbit(unsigned int ioaddr)
{ {
unsigned d; unsigned d;
...@@ -497,7 +497,7 @@ mii_getbit(kio_addr_t ioaddr) ...@@ -497,7 +497,7 @@ mii_getbit(kio_addr_t ioaddr)
} }
static void static void
mii_wbits(kio_addr_t ioaddr, unsigned data, int len) mii_wbits(unsigned int ioaddr, unsigned data, int len)
{ {
unsigned m = 1 << (len-1); unsigned m = 1 << (len-1);
for (; m; m >>= 1) for (; m; m >>= 1)
...@@ -505,7 +505,7 @@ mii_wbits(kio_addr_t ioaddr, unsigned data, int len) ...@@ -505,7 +505,7 @@ mii_wbits(kio_addr_t ioaddr, unsigned data, int len)
} }
static unsigned static unsigned
mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg) mii_rd(unsigned int ioaddr, u_char phyaddr, u_char phyreg)
{ {
int i; int i;
unsigned data=0, m; unsigned data=0, m;
...@@ -527,7 +527,8 @@ mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg) ...@@ -527,7 +527,8 @@ mii_rd(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg)
} }
static void static void
mii_wr(kio_addr_t ioaddr, u_char phyaddr, u_char phyreg, unsigned data, int len) mii_wr(unsigned int ioaddr, u_char phyaddr, u_char phyreg, unsigned data,
int len)
{ {
int i; int i;
...@@ -726,7 +727,7 @@ xirc2ps_config(struct pcmcia_device * link) ...@@ -726,7 +727,7 @@ xirc2ps_config(struct pcmcia_device * link)
local_info_t *local = netdev_priv(dev); local_info_t *local = netdev_priv(dev);
tuple_t tuple; tuple_t tuple;
cisparse_t parse; cisparse_t parse;
kio_addr_t ioaddr; unsigned int ioaddr;
int err, i; int err, i;
u_char buf[64]; u_char buf[64];
cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data; 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,7 +1105,7 @@ xirc2ps_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
local_info_t *lp = netdev_priv(dev); local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr; unsigned int ioaddr;
u_char saved_page; u_char saved_page;
unsigned bytes_rcvd; unsigned bytes_rcvd;
unsigned int_status, eth_status, rx_status, tx_status; unsigned int_status, eth_status, rx_status, tx_status;
...@@ -1209,7 +1210,7 @@ xirc2ps_interrupt(int irq, void *dev_id) ...@@ -1209,7 +1210,7 @@ xirc2ps_interrupt(int irq, void *dev_id)
unsigned i; unsigned i;
u_long *p = skb_put(skb, pktlen); u_long *p = skb_put(skb, pktlen);
register u_long a; register u_long a;
kio_addr_t edpreg = ioaddr+XIRCREG_EDP-2; unsigned int edpreg = ioaddr+XIRCREG_EDP-2;
for (i=0; i < len ; i += 4, p++) { for (i=0; i < len ; i += 4, p++) {
a = inl(edpreg); a = inl(edpreg);
__asm__("rorl $16,%0\n\t" __asm__("rorl $16,%0\n\t"
...@@ -1346,7 +1347,7 @@ static int ...@@ -1346,7 +1347,7 @@ static int
do_start_xmit(struct sk_buff *skb, struct net_device *dev) do_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
local_info_t *lp = netdev_priv(dev); local_info_t *lp = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
int okay; int okay;
unsigned freespace; unsigned freespace;
unsigned pktlen = skb->len; unsigned pktlen = skb->len;
...@@ -1415,7 +1416,7 @@ do_get_stats(struct net_device *dev) ...@@ -1415,7 +1416,7 @@ do_get_stats(struct net_device *dev)
static void static void
set_addresses(struct net_device *dev) set_addresses(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
local_info_t *lp = netdev_priv(dev); local_info_t *lp = netdev_priv(dev);
struct dev_mc_list *dmi = dev->mc_list; struct dev_mc_list *dmi = dev->mc_list;
unsigned char *addr; unsigned char *addr;
...@@ -1459,7 +1460,7 @@ set_addresses(struct net_device *dev) ...@@ -1459,7 +1460,7 @@ set_addresses(struct net_device *dev)
static void static void
set_multicast_list(struct net_device *dev) set_multicast_list(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
SelectPage(0x42); SelectPage(0x42);
if (dev->flags & IFF_PROMISC) { /* snoop */ if (dev->flags & IFF_PROMISC) { /* snoop */
...@@ -1543,7 +1544,7 @@ static int ...@@ -1543,7 +1544,7 @@ static int
do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
local_info_t *local = netdev_priv(dev); local_info_t *local = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
u16 *data = (u16 *)&rq->ifr_ifru; u16 *data = (u16 *)&rq->ifr_ifru;
DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n", DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n",
...@@ -1575,7 +1576,7 @@ static void ...@@ -1575,7 +1576,7 @@ static void
hardreset(struct net_device *dev) hardreset(struct net_device *dev)
{ {
local_info_t *local = netdev_priv(dev); local_info_t *local = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
SelectPage(4); SelectPage(4);
udelay(1); udelay(1);
...@@ -1592,7 +1593,7 @@ static void ...@@ -1592,7 +1593,7 @@ static void
do_reset(struct net_device *dev, int full) do_reset(struct net_device *dev, int full)
{ {
local_info_t *local = netdev_priv(dev); local_info_t *local = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned value; unsigned value;
DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full); DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
...@@ -1753,7 +1754,7 @@ static int ...@@ -1753,7 +1754,7 @@ static int
init_mii(struct net_device *dev) init_mii(struct net_device *dev)
{ {
local_info_t *local = netdev_priv(dev); local_info_t *local = netdev_priv(dev);
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
unsigned control, status, linkpartner; unsigned control, status, linkpartner;
int i; int i;
...@@ -1826,7 +1827,7 @@ static void ...@@ -1826,7 +1827,7 @@ static void
do_powerdown(struct net_device *dev) do_powerdown(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
DEBUG(0, "do_powerdown(%p)\n", dev); DEBUG(0, "do_powerdown(%p)\n", dev);
...@@ -1838,7 +1839,7 @@ do_powerdown(struct net_device *dev) ...@@ -1838,7 +1839,7 @@ do_powerdown(struct net_device *dev)
static int static int
do_stop(struct net_device *dev) do_stop(struct net_device *dev)
{ {
kio_addr_t ioaddr = dev->base_addr; unsigned int ioaddr = dev->base_addr;
local_info_t *lp = netdev_priv(dev); local_info_t *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev; struct pcmcia_device *link = lp->p_dev;
......
drivers/net/wireless/netwave_cs.c
浏览文件 @ 906da809
...@@ -195,7 +195,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *arg); /* Runs after card ...@@ -195,7 +195,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *arg); /* Runs after card
static void netwave_detach(struct pcmcia_device *p_dev); /* Destroy instance */ static void netwave_detach(struct pcmcia_device *p_dev); /* Destroy instance */
/* Hardware configuration */ /* Hardware configuration */
static void netwave_doreset(kio_addr_t iobase, u_char __iomem *ramBase); static void netwave_doreset(unsigned int iobase, u_char __iomem *ramBase);
static void netwave_reset(struct net_device *dev); static void netwave_reset(struct net_device *dev);
/* Misc device stuff */ /* Misc device stuff */
...@@ -309,7 +309,7 @@ static inline void wait_WOC(unsigned int iobase) ...@@ -309,7 +309,7 @@ static inline void wait_WOC(unsigned int iobase)
} }
static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase, static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase,
kio_addr_t iobase) { unsigned int iobase) {
u_short resultBuffer; u_short resultBuffer;
/* if time since last snapshot is > 1 sec. (100 jiffies?) then take /* if time since last snapshot is > 1 sec. (100 jiffies?) then take
...@@ -340,7 +340,7 @@ static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase, ...@@ -340,7 +340,7 @@ static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase,
static struct iw_statistics *netwave_get_wireless_stats(struct net_device *dev) static struct iw_statistics *netwave_get_wireless_stats(struct net_device *dev)
{ {
unsigned long flags; unsigned long flags;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
struct iw_statistics* wstats; struct iw_statistics* wstats;
...@@ -471,7 +471,7 @@ static int netwave_set_nwid(struct net_device *dev, ...@@ -471,7 +471,7 @@ static int netwave_set_nwid(struct net_device *dev,
char *extra) char *extra)
{ {
unsigned long flags; unsigned long flags;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
...@@ -518,7 +518,7 @@ static int netwave_set_scramble(struct net_device *dev, ...@@ -518,7 +518,7 @@ static int netwave_set_scramble(struct net_device *dev,
char *key) char *key)
{ {
unsigned long flags; unsigned long flags;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
...@@ -621,7 +621,7 @@ static int netwave_get_snap(struct net_device *dev, ...@@ -621,7 +621,7 @@ static int netwave_get_snap(struct net_device *dev,
char *extra) char *extra)
{ {
unsigned long flags; unsigned long flags;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
...@@ -874,7 +874,7 @@ static int netwave_resume(struct pcmcia_device *link) ...@@ -874,7 +874,7 @@ static int netwave_resume(struct pcmcia_device *link)
* *
* Proper hardware reset of the card. * Proper hardware reset of the card.
*/ */
static void netwave_doreset(kio_addr_t ioBase, u_char __iomem *ramBase) static void netwave_doreset(unsigned int ioBase, u_char __iomem *ramBase)
{ {
/* Reset card */ /* Reset card */
wait_WOC(ioBase); wait_WOC(ioBase);
...@@ -892,7 +892,7 @@ static void netwave_reset(struct net_device *dev) { ...@@ -892,7 +892,7 @@ static void netwave_reset(struct net_device *dev) {
/* u_char state; */ /* u_char state; */
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
DEBUG(0, "netwave_reset: Done with hardware reset\n"); DEBUG(0, "netwave_reset: Done with hardware reset\n");
...@@ -973,7 +973,7 @@ static int netwave_hw_xmit(unsigned char* data, int len, ...@@ -973,7 +973,7 @@ static int netwave_hw_xmit(unsigned char* data, int len,
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem * ramBase = priv->ramBase; u_char __iomem * ramBase = priv->ramBase;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
/* Disable interrupts & save flags */ /* Disable interrupts & save flags */
spin_lock_irqsave(&priv->spinlock, flags); spin_lock_irqsave(&priv->spinlock, flags);
...@@ -1065,7 +1065,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) { ...@@ -1065,7 +1065,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) {
*/ */
static irqreturn_t netwave_interrupt(int irq, void* dev_id) static irqreturn_t netwave_interrupt(int irq, void* dev_id)
{ {
kio_addr_t iobase; unsigned int iobase;
u_char __iomem *ramBase; u_char __iomem *ramBase;
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct netwave_private *priv = netdev_priv(dev); struct netwave_private *priv = netdev_priv(dev);
...@@ -1235,7 +1235,7 @@ static int netwave_rx(struct net_device *dev) ...@@ -1235,7 +1235,7 @@ static int netwave_rx(struct net_device *dev)
{ {
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem *ramBase = priv->ramBase; u_char __iomem *ramBase = priv->ramBase;
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
u_char rxStatus; u_char rxStatus;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
unsigned int curBuffer, unsigned int curBuffer,
...@@ -1388,7 +1388,7 @@ module_exit(exit_netwave_cs); ...@@ -1388,7 +1388,7 @@ module_exit(exit_netwave_cs);
*/ */
static void set_multicast_list(struct net_device *dev) static void set_multicast_list(struct net_device *dev)
{ {
kio_addr_t iobase = dev->base_addr; unsigned int iobase = dev->base_addr;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
u_char __iomem * ramBase = priv->ramBase; u_char __iomem * ramBase = priv->ramBase;
u_char rcvMode = 0; u_char rcvMode = 0;
......
drivers/net/wireless/wavelan_cs.c
浏览文件 @ 906da809
...@@ -149,7 +149,7 @@ psa_write(struct net_device * dev, ...@@ -149,7 +149,7 @@ psa_write(struct net_device * dev,
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
u_char __iomem *ptr = lp->mem + PSA_ADDR + (o << 1); u_char __iomem *ptr = lp->mem + PSA_ADDR + (o << 1);
int count = 0; int count = 0;
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
/* As there seem to have no flag PSA_BUSY as in the ISA model, we are /* As there seem to have no flag PSA_BUSY as in the ISA model, we are
* oblige to verify this address to know when the PSA is ready... */ * oblige to verify this address to know when the PSA is ready... */
volatile u_char __iomem *verify = lp->mem + PSA_ADDR + volatile u_char __iomem *verify = lp->mem + PSA_ADDR +
...@@ -708,7 +708,7 @@ static void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqua ...@@ -708,7 +708,7 @@ static void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqua
/* Perform a handover to a new WavePoint */ /* Perform a handover to a new WavePoint */
static void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp) static void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp)
{ {
kio_addr_t base = lp->dev->base_addr; unsigned int base = lp->dev->base_addr;
mm_t m; mm_t m;
unsigned long flags; unsigned long flags;
...@@ -821,7 +821,7 @@ wv_82593_cmd(struct net_device * dev, ...@@ -821,7 +821,7 @@ wv_82593_cmd(struct net_device * dev,
int cmd, int cmd,
int result) int result)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
int status; int status;
int wait_completed; int wait_completed;
long spin; long spin;
...@@ -945,7 +945,7 @@ read_ringbuf(struct net_device * dev, ...@@ -945,7 +945,7 @@ read_ringbuf(struct net_device * dev,
char * buf, char * buf,
int len) int len)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
int ring_ptr = addr; int ring_ptr = addr;
int chunk_len; int chunk_len;
char * buf_ptr = buf; char * buf_ptr = buf;
...@@ -1096,7 +1096,7 @@ wv_psa_show(psa_t * p) ...@@ -1096,7 +1096,7 @@ wv_psa_show(psa_t * p)
static void static void
wv_mmc_show(struct net_device * dev) wv_mmc_show(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
mmr_t m; mmr_t m;
...@@ -1275,7 +1275,7 @@ wv_packet_info(u_char * p, /* Packet to dump */ ...@@ -1275,7 +1275,7 @@ wv_packet_info(u_char * p, /* Packet to dump */
static inline void static inline void
wv_init_info(struct net_device * dev) wv_init_info(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
psa_t psa; psa_t psa;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
...@@ -1294,7 +1294,7 @@ wv_init_info(struct net_device * dev) ...@@ -1294,7 +1294,7 @@ wv_init_info(struct net_device * dev)
#ifdef DEBUG_BASIC_SHOW #ifdef DEBUG_BASIC_SHOW
/* Now, let's go for the basic stuff */ /* Now, let's go for the basic stuff */
printk(KERN_NOTICE "%s: WaveLAN: port %#lx, irq %d, " printk(KERN_NOTICE "%s: WaveLAN: port %#x, irq %d, "
"hw_addr %s", "hw_addr %s",
dev->name, base, dev->irq, dev->name, base, dev->irq,
print_mac(mac, dev->dev_addr)); print_mac(mac, dev->dev_addr));
...@@ -1828,7 +1828,7 @@ static int wavelan_set_nwid(struct net_device *dev, ...@@ -1828,7 +1828,7 @@ static int wavelan_set_nwid(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
psa_t psa; psa_t psa;
mm_t m; mm_t m;
...@@ -1918,7 +1918,7 @@ static int wavelan_set_freq(struct net_device *dev, ...@@ -1918,7 +1918,7 @@ static int wavelan_set_freq(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int ret; int ret;
...@@ -1948,7 +1948,7 @@ static int wavelan_get_freq(struct net_device *dev, ...@@ -1948,7 +1948,7 @@ static int wavelan_get_freq(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
psa_t psa; psa_t psa;
unsigned long flags; unsigned long flags;
...@@ -1994,7 +1994,7 @@ static int wavelan_set_sens(struct net_device *dev, ...@@ -1994,7 +1994,7 @@ static int wavelan_set_sens(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
psa_t psa; psa_t psa;
unsigned long flags; unsigned long flags;
...@@ -2060,7 +2060,7 @@ static int wavelan_set_encode(struct net_device *dev, ...@@ -2060,7 +2060,7 @@ static int wavelan_set_encode(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
psa_t psa; psa_t psa;
...@@ -2130,7 +2130,7 @@ static int wavelan_get_encode(struct net_device *dev, ...@@ -2130,7 +2130,7 @@ static int wavelan_get_encode(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
psa_t psa; psa_t psa;
unsigned long flags; unsigned long flags;
...@@ -2349,7 +2349,7 @@ static int wavelan_get_range(struct net_device *dev, ...@@ -2349,7 +2349,7 @@ static int wavelan_get_range(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
struct iw_range *range = (struct iw_range *) extra; struct iw_range *range = (struct iw_range *) extra;
unsigned long flags; unsigned long flags;
...@@ -2425,7 +2425,7 @@ static int wavelan_set_qthr(struct net_device *dev, ...@@ -2425,7 +2425,7 @@ static int wavelan_set_qthr(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local *lp = netdev_priv(dev); net_local *lp = netdev_priv(dev);
psa_t psa; psa_t psa;
unsigned long flags; unsigned long flags;
...@@ -2701,7 +2701,7 @@ static const struct iw_handler_def wavelan_handler_def = ...@@ -2701,7 +2701,7 @@ static const struct iw_handler_def wavelan_handler_def =
static iw_stats * static iw_stats *
wavelan_get_wireless_stats(struct net_device * dev) wavelan_get_wireless_stats(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
mmr_t m; mmr_t m;
iw_stats * wstats; iw_stats * wstats;
...@@ -2764,7 +2764,7 @@ wv_start_of_frame(struct net_device * dev, ...@@ -2764,7 +2764,7 @@ wv_start_of_frame(struct net_device * dev,
int rfp, /* end of frame */ int rfp, /* end of frame */
int wrap) /* start of buffer */ int wrap) /* start of buffer */
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
int rp; int rp;
int len; int len;
...@@ -2925,7 +2925,7 @@ wv_packet_read(struct net_device * dev, ...@@ -2925,7 +2925,7 @@ wv_packet_read(struct net_device * dev,
static inline void static inline void
wv_packet_rcv(struct net_device * dev) wv_packet_rcv(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
int newrfp; int newrfp;
int rp; int rp;
...@@ -3062,7 +3062,7 @@ wv_packet_write(struct net_device * dev, ...@@ -3062,7 +3062,7 @@ wv_packet_write(struct net_device * dev,
short length) short length)
{ {
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
unsigned long flags; unsigned long flags;
int clen = length; int clen = length;
register u_short xmtdata_base = TX_BASE; register u_short xmtdata_base = TX_BASE;
...@@ -3183,7 +3183,7 @@ wavelan_packet_xmit(struct sk_buff * skb, ...@@ -3183,7 +3183,7 @@ wavelan_packet_xmit(struct sk_buff * skb,
static inline int static inline int
wv_mmc_init(struct net_device * dev) wv_mmc_init(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
psa_t psa; psa_t psa;
mmw_t m; mmw_t m;
int configured; int configured;
...@@ -3377,7 +3377,7 @@ wv_mmc_init(struct net_device * dev) ...@@ -3377,7 +3377,7 @@ wv_mmc_init(struct net_device * dev)
static int static int
wv_ru_stop(struct net_device * dev) wv_ru_stop(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int status; int status;
...@@ -3440,7 +3440,7 @@ wv_ru_stop(struct net_device * dev) ...@@ -3440,7 +3440,7 @@ wv_ru_stop(struct net_device * dev)
static int static int
wv_ru_start(struct net_device * dev) wv_ru_start(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
...@@ -3528,7 +3528,7 @@ wv_ru_start(struct net_device * dev) ...@@ -3528,7 +3528,7 @@ wv_ru_start(struct net_device * dev)
static int static int
wv_82593_config(struct net_device * dev) wv_82593_config(struct net_device * dev)
{ {
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
struct i82593_conf_block cfblk; struct i82593_conf_block cfblk;
int ret = TRUE; int ret = TRUE;
...@@ -3765,7 +3765,7 @@ static int ...@@ -3765,7 +3765,7 @@ static int
wv_hw_config(struct net_device * dev) wv_hw_config(struct net_device * dev)
{ {
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
unsigned long flags; unsigned long flags;
int ret = FALSE; int ret = FALSE;
...@@ -4047,7 +4047,7 @@ wavelan_interrupt(int irq, ...@@ -4047,7 +4047,7 @@ wavelan_interrupt(int irq,
{ {
struct net_device * dev = dev_id; struct net_device * dev = dev_id;
net_local * lp; net_local * lp;
kio_addr_t base; unsigned int base;
int status0; int status0;
u_int tx_status; u_int tx_status;
...@@ -4306,7 +4306,7 @@ static void ...@@ -4306,7 +4306,7 @@ static void
wavelan_watchdog(struct net_device * dev) wavelan_watchdog(struct net_device * dev)
{ {
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
unsigned long flags; unsigned long flags;
int aborted = FALSE; int aborted = FALSE;
...@@ -4382,7 +4382,7 @@ wavelan_open(struct net_device * dev) ...@@ -4382,7 +4382,7 @@ wavelan_open(struct net_device * dev)
{ {
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
struct pcmcia_device * link = lp->link; struct pcmcia_device * link = lp->link;
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
#ifdef DEBUG_CALLBACK_TRACE #ifdef DEBUG_CALLBACK_TRACE
printk(KERN_DEBUG "%s: ->wavelan_open(dev=0x%x)\n", dev->name, printk(KERN_DEBUG "%s: ->wavelan_open(dev=0x%x)\n", dev->name,
...@@ -4436,7 +4436,7 @@ static int ...@@ -4436,7 +4436,7 @@ static int
wavelan_close(struct net_device * dev) wavelan_close(struct net_device * dev)
{ {
struct pcmcia_device * link = ((net_local *)netdev_priv(dev))->link; struct pcmcia_device * link = ((net_local *)netdev_priv(dev))->link;
kio_addr_t base = dev->base_addr; unsigned int base = dev->base_addr;
#ifdef DEBUG_CALLBACK_TRACE #ifdef DEBUG_CALLBACK_TRACE
printk(KERN_DEBUG "%s: ->wavelan_close(dev=0x%x)\n", dev->name, printk(KERN_DEBUG "%s: ->wavelan_close(dev=0x%x)\n", dev->name,
......
drivers/pcmcia/i82092.c
浏览文件 @ 906da809
...@@ -82,7 +82,7 @@ struct socket_info { ...@@ -82,7 +82,7 @@ struct socket_info {
1 = empty socket, 1 = empty socket,
2 = card but not initialized, 2 = card but not initialized,
3 = operational card */ 3 = operational card */
kio_addr_t io_base; /* base io address of the socket */ unsigned int io_base; /* base io address of the socket */
struct pcmcia_socket socket; struct pcmcia_socket socket;
struct pci_dev *dev; /* The PCI device for the socket */ struct pci_dev *dev; /* The PCI device for the socket */
......
drivers/pcmcia/i82365.c
浏览文件 @ 906da809
...@@ -164,7 +164,7 @@ struct i82365_socket { ...@@ -164,7 +164,7 @@ struct i82365_socket {
u_short type, flags; u_short type, flags;
struct pcmcia_socket socket; struct pcmcia_socket socket;
unsigned int number; unsigned int number;
kio_addr_t ioaddr; unsigned int ioaddr;
u_short psock; u_short psock;
u_char cs_irq, intr; u_char cs_irq, intr;
union { union {
...@@ -238,7 +238,7 @@ static u_char i365_get(u_short sock, u_short reg) ...@@ -238,7 +238,7 @@ static u_char i365_get(u_short sock, u_short reg)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&bus_lock,flags); spin_lock_irqsave(&bus_lock,flags);
{ {
kio_addr_t port = socket[sock].ioaddr; unsigned int port = socket[sock].ioaddr;
u_char val; u_char val;
reg = I365_REG(socket[sock].psock, reg); reg = I365_REG(socket[sock].psock, reg);
outb(reg, port); val = inb(port+1); outb(reg, port); val = inb(port+1);
...@@ -252,7 +252,7 @@ static void i365_set(u_short sock, u_short reg, u_char data) ...@@ -252,7 +252,7 @@ static void i365_set(u_short sock, u_short reg, u_char data)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&bus_lock,flags); spin_lock_irqsave(&bus_lock,flags);
{ {
kio_addr_t port = socket[sock].ioaddr; unsigned int port = socket[sock].ioaddr;
u_char val = I365_REG(socket[sock].psock, reg); u_char val = I365_REG(socket[sock].psock, reg);
outb(val, port); outb(data, port+1); outb(val, port); outb(data, port+1);
spin_unlock_irqrestore(&bus_lock,flags); spin_unlock_irqrestore(&bus_lock,flags);
...@@ -588,7 +588,7 @@ static int to_cycles(int ns) ...@@ -588,7 +588,7 @@ static int to_cycles(int ns)
/*====================================================================*/ /*====================================================================*/
static int __init identify(kio_addr_t port, u_short sock) static int __init identify(unsigned int port, u_short sock)
{ {
u_char val; u_char val;
int type = -1; int type = -1;
...@@ -659,7 +659,7 @@ static int __init identify(kio_addr_t port, u_short sock) ...@@ -659,7 +659,7 @@ static int __init identify(kio_addr_t port, u_short sock)
static int __init is_alive(u_short sock) static int __init is_alive(u_short sock)
{ {
u_char stat; u_char stat;
kio_addr_t start, stop; unsigned int start, stop;
stat = i365_get(sock, I365_STATUS); stat = i365_get(sock, I365_STATUS);
start = i365_get_pair(sock, I365_IO(0)+I365_W_START); start = i365_get_pair(sock, I365_IO(0)+I365_W_START);
...@@ -678,7 +678,7 @@ static int __init is_alive(u_short sock) ...@@ -678,7 +678,7 @@ static int __init is_alive(u_short sock)
/*====================================================================*/ /*====================================================================*/
static void __init add_socket(kio_addr_t port, int psock, int type) static void __init add_socket(unsigned int port, int psock, int type)
{ {
socket[sockets].ioaddr = port; socket[sockets].ioaddr = port;
socket[sockets].psock = psock; socket[sockets].psock = psock;
...@@ -698,7 +698,7 @@ static void __init add_pcic(int ns, int type) ...@@ -698,7 +698,7 @@ static void __init add_pcic(int ns, int type)
base = sockets-ns; base = sockets-ns;
if (base == 0) printk("\n"); if (base == 0) printk("\n");
printk(KERN_INFO " %s", pcic[type].name); printk(KERN_INFO " %s", pcic[type].name);
printk(" ISA-to-PCMCIA at port %#lx ofs 0x%02x", printk(" ISA-to-PCMCIA at port %#x ofs 0x%02x",
t->ioaddr, t->psock*0x40); t->ioaddr, t->psock*0x40);
printk(", %d socket%s\n", ns, ((ns > 1) ? "s" : "")); printk(", %d socket%s\n", ns, ((ns > 1) ? "s" : ""));
...@@ -772,7 +772,7 @@ static struct pnp_dev *i82365_pnpdev; ...@@ -772,7 +772,7 @@ static struct pnp_dev *i82365_pnpdev;
static void __init isa_probe(void) static void __init isa_probe(void)
{ {
int i, j, sock, k, ns, id; int i, j, sock, k, ns, id;
kio_addr_t port; unsigned int port;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
struct isapnp_device_id *devid; struct isapnp_device_id *devid;
struct pnp_dev *dev; struct pnp_dev *dev;
...@@ -1053,7 +1053,7 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io) ...@@ -1053,7 +1053,7 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map, ioctl; u_char map, ioctl;
debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, " debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#lx-%#lx)\n", sock, io->map, io->flags, "%#x-%#x)\n", sock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, io->start, io->stop);
map = io->map; map = io->map;
if ((map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) || if ((map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
......
drivers/pcmcia/m32r_cfc.c
浏览文件 @ 906da809
...@@ -58,7 +58,7 @@ typedef struct pcc_socket { ...@@ -58,7 +58,7 @@ typedef struct pcc_socket {
u_short type, flags; u_short type, flags;
struct pcmcia_socket socket; struct pcmcia_socket socket;
unsigned int number; unsigned int number;
kio_addr_t ioaddr; unsigned int ioaddr;
u_long mapaddr; u_long mapaddr;
u_long base; /* PCC register base */ u_long base; /* PCC register base */
u_char cs_irq1, cs_irq2, intr; u_char cs_irq1, cs_irq2, intr;
...@@ -298,7 +298,8 @@ static int __init is_alive(u_short sock) ...@@ -298,7 +298,8 @@ static int __init is_alive(u_short sock)
return 0; return 0;
} }
static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr) static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
unsigned int ioaddr)
{ {
pcc_socket_t *t = &socket[pcc_sockets]; pcc_socket_t *t = &socket[pcc_sockets];
...@@ -738,7 +739,7 @@ static int __init init_m32r_pcc(void) ...@@ -738,7 +739,7 @@ static int __init init_m32r_pcc(void)
#else /* CONFIG_PLAT_USRV */ #else /* CONFIG_PLAT_USRV */
{ {
ulong base, mapaddr; ulong base, mapaddr;
kio_addr_t ioaddr; unsigned int ioaddr;
for (i = 0 ; i < M32R_MAX_PCC ; i++) { for (i = 0 ; i < M32R_MAX_PCC ; i++) {
base = (ulong)PLD_CFRSTCR; base = (ulong)PLD_CFRSTCR;
......
drivers/pcmcia/m32r_pcc.c
浏览文件 @ 906da809
...@@ -65,7 +65,7 @@ typedef struct pcc_socket { ...@@ -65,7 +65,7 @@ typedef struct pcc_socket {
u_short type, flags; u_short type, flags;
struct pcmcia_socket socket; struct pcmcia_socket socket;
unsigned int number; unsigned int number;
kio_addr_t ioaddr; unsigned int ioaddr;
u_long mapaddr; u_long mapaddr;
u_long base; /* PCC register base */ u_long base; /* PCC register base */
u_char cs_irq, intr; u_char cs_irq, intr;
...@@ -310,7 +310,8 @@ static int __init is_alive(u_short sock) ...@@ -310,7 +310,8 @@ static int __init is_alive(u_short sock)
return 0; return 0;
} }
static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr) static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
unsigned int ioaddr)
{ {
pcc_socket_t *t = &socket[pcc_sockets]; pcc_socket_t *t = &socket[pcc_sockets];
...@@ -491,7 +492,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) ...@@ -491,7 +492,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map; u_char map;
debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, " debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#lx-%#lx)\n", sock, io->map, io->flags, "%#x-%#x)\n", sock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, io->start, io->stop);
map = io->map; map = io->map;
......
drivers/pcmcia/rsrc_nonstatic.c
浏览文件 @ 906da809
...@@ -186,15 +186,16 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num) ...@@ -186,15 +186,16 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
======================================================================*/ ======================================================================*/
#ifdef CONFIG_PCMCIA_PROBE #ifdef CONFIG_PCMCIA_PROBE
static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num) static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
unsigned int num)
{ {
struct resource *res; struct resource *res;
struct socket_data *s_data = s->resource_data; struct socket_data *s_data = s->resource_data;
kio_addr_t i, j, bad; unsigned int i, j, bad;
int any; int any;
u_char *b, hole, most; u_char *b, hole, most;
printk(KERN_INFO "cs: IO port probe %#lx-%#lx:", printk(KERN_INFO "cs: IO port probe %#x-%#x:",
base, base+num-1); base, base+num-1);
/* First, what does a floating port look like? */ /* First, what does a floating port look like? */
...@@ -233,7 +234,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num ...@@ -233,7 +234,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num
} else { } else {
if (bad) { if (bad) {
sub_interval(&s_data->io_db, bad, i-bad); sub_interval(&s_data->io_db, bad, i-bad);
printk(" %#lx-%#lx", bad, i-1); printk(" %#x-%#x", bad, i-1);
bad = 0; bad = 0;
} }
} }
...@@ -244,7 +245,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num ...@@ -244,7 +245,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num
return; return;
} else { } else {
sub_interval(&s_data->io_db, bad, i-bad); sub_interval(&s_data->io_db, bad, i-bad);
printk(" %#lx-%#lx", bad, i-1); printk(" %#x-%#x", bad, i-1);
} }
} }
......
drivers/pcmcia/tcic.c
浏览文件 @ 906da809
...@@ -719,7 +719,7 @@ static int tcic_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) ...@@ -719,7 +719,7 @@ static int tcic_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
u_short base, len, ioctl; u_short base, len, ioctl;
debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, " debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#lx-%#lx)\n", psock, io->map, io->flags, "%#x-%#x)\n", psock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, io->start, io->stop);
if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) || if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
(io->stop < io->start)) return -EINVAL; (io->stop < io->start)) return -EINVAL;
......
drivers/serial/serial_cs.c
浏览文件 @ 906da809
...@@ -389,7 +389,7 @@ static void serial_detach(struct pcmcia_device *link) ...@@ -389,7 +389,7 @@ static void serial_detach(struct pcmcia_device *link)
/*====================================================================*/ /*====================================================================*/
static int setup_serial(struct pcmcia_device *handle, struct serial_info * info, static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
kio_addr_t iobase, int irq) unsigned int iobase, int irq)
{ {
struct uart_port port; struct uart_port port;
int line; int line;
...@@ -456,7 +456,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse) ...@@ -456,7 +456,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
static int simple_config(struct pcmcia_device *link) static int simple_config(struct pcmcia_device *link)
{ {
static const kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
static const int size_table[2] = { 8, 16 }; static const int size_table[2] = { 8, 16 };
struct serial_info *info = link->priv; struct serial_info *info = link->priv;
struct serial_cfg_mem *cfg_mem; struct serial_cfg_mem *cfg_mem;
...@@ -480,7 +480,7 @@ static int simple_config(struct pcmcia_device *link) ...@@ -480,7 +480,7 @@ static int simple_config(struct pcmcia_device *link)
/* If the card is already configured, look up the port and irq */ /* If the card is already configured, look up the port and irq */
i = pcmcia_get_configuration_info(link, &config); i = pcmcia_get_configuration_info(link, &config);
if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) { if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
kio_addr_t port = 0; unsigned int port = 0;
if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) { if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
port = config.BasePort2; port = config.BasePort2;
info->slave = 1; info->slave = 1;
......
include/pcmcia/cs_types.h
浏览文件 @ 906da809
...@@ -27,7 +27,6 @@ typedef u_int ioaddr_t; ...@@ -27,7 +27,6 @@ typedef u_int ioaddr_t;
#else #else
typedef u_short ioaddr_t; typedef u_short ioaddr_t;
#endif #endif
typedef unsigned long kio_addr_t;
typedef u_short socket_t; typedef u_short socket_t;
typedef u_int event_t; typedef u_int event_t;
......
include/pcmcia/ss.h
浏览文件 @ 906da809
...@@ -92,7 +92,7 @@ typedef struct pccard_io_map { ...@@ -92,7 +92,7 @@ typedef struct pccard_io_map {
u_char map; u_char map;
u_char flags; u_char flags;
u_short speed; u_short speed;
kio_addr_t start, stop; u_int start, stop;
} pccard_io_map; } pccard_io_map;
typedef struct pccard_mem_map { typedef struct pccard_mem_map {
...@@ -155,7 +155,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops; ...@@ -155,7 +155,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops;
struct pcmcia_socket; struct pcmcia_socket;
typedef struct io_window_t { typedef struct io_window_t {
kio_addr_t InUse, Config; u_int InUse, Config;
struct resource *res; struct resource *res;
} io_window_t; } io_window_t;
...@@ -208,7 +208,7 @@ struct pcmcia_socket { ...@@ -208,7 +208,7 @@ struct pcmcia_socket {
u_int features; u_int features;
u_int irq_mask; u_int irq_mask;
u_int map_size; u_int map_size;
kio_addr_t io_offset; u_int io_offset;
u_char pci_irq; u_char pci_irq;
struct pci_dev * cb_dev; struct pci_dev * cb_dev;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或