git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
net
/
arcnet
/
arc-rimi.c
diff --git
a/drivers/net/arcnet/arc-rimi.c
b/drivers/net/arcnet/arc-rimi.c
index
77ff7df
..
edcc387
100644
(file)
--- a/
drivers/net/arcnet/arc-rimi.c
+++ b/
drivers/net/arcnet/arc-rimi.c
@@
-231,7
+231,7
@@
err_free_irq:
static int arcrimi_reset(struct net_device *dev, int really_reset)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
static int arcrimi_reset(struct net_device *dev, int really_reset)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *ioaddr = lp->mem_start + 0x800;
+ void
__iomem
*ioaddr = lp->mem_start + 0x800;
BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", dev->name, ASTATUS());
BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", dev->name, ASTATUS());
@@
-252,7
+252,7
@@
static int arcrimi_reset(struct net_device *dev, int really_reset)
static void arcrimi_setmask(struct net_device *dev, int mask)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
static void arcrimi_setmask(struct net_device *dev, int mask)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *ioaddr = lp->mem_start + 0x800;
+ void
__iomem
*ioaddr = lp->mem_start + 0x800;
AINTMASK(mask);
}
AINTMASK(mask);
}
@@
-260,7
+260,7
@@
static void arcrimi_setmask(struct net_device *dev, int mask)
static int arcrimi_status(struct net_device *dev)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
static int arcrimi_status(struct net_device *dev)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *ioaddr = lp->mem_start + 0x800;
+ void
__iomem
*ioaddr = lp->mem_start + 0x800;
return ASTATUS();
}
return ASTATUS();
}
@@
-268,7
+268,7
@@
static int arcrimi_status(struct net_device *dev)
static void arcrimi_command(struct net_device *dev, int cmd)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
static void arcrimi_command(struct net_device *dev, int cmd)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *ioaddr = lp->mem_start + 0x800;
+ void
__iomem
*ioaddr = lp->mem_start + 0x800;
ACOMMAND(cmd);
}
ACOMMAND(cmd);
}
@@
-277,7
+277,7
@@
static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,
void *buf, int count)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
void *buf, int count)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
+ void
__iomem
*memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
}
TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
}
@@
-286,7
+286,7
@@
static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse
void *buf, int count)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
void *buf, int count)
{
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
- void *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
+ void
__iomem
*memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
}
TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
}