summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-08 10:01:10 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 05:12:45 +0100
commit3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5 (patch)
tree92f8471f9776088acec5db6efb7fe9158446a583 /drivers/net
parent[PATCH] cs89x0: swap {read,write}reg and {read,write}word (diff)
downloadlinux-3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5.tar.xz
linux-3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5.zip
[PATCH] cs89x0: make {read,write}reg use {read,write}word
Make readreg/writereg use readword/writeword. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Cc: dmitry pervushin <dpervushin@ru.mvista.com> Cc: <dsaxena@plexity.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/cs89x0.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 221f92e45ec7..756d80adc47b 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -351,17 +351,17 @@ writeword(unsigned long base_addr, int portno, int value)
}
static int
-readreg(struct net_device *dev, int portno)
+readreg(struct net_device *dev, int regno)
{
- outw(portno, dev->base_addr + ADD_PORT);
- return inw(dev->base_addr + DATA_PORT);
+ writeword(dev->base_addr, ADD_PORT, regno);
+ return readword(dev->base_addr, DATA_PORT);
}
static void
-writereg(struct net_device *dev, int portno, int value)
+writereg(struct net_device *dev, int regno, int value)
{
- outw(portno, dev->base_addr + ADD_PORT);
- outw(value, dev->base_addr + DATA_PORT);
+ writeword(dev->base_addr, ADD_PORT, regno);
+ writeword(dev->base_addr, DATA_PORT, value);
}
static int __init