aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cs89x0.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-08 01:01:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:12:45 -0800
commit0d5affcfe23ade8c4c01154e7e381e2a9a916399 (patch)
treeba1e07c7e7ade464c79fa76681f5883136333608 /drivers/net/cs89x0.c
parentfc8c7d79b117f7a5b17640bf657d95afe4025bb8 (diff)
downloadkernel_samsung_smdk4412-0d5affcfe23ade8c4c01154e7e381e2a9a916399.zip
kernel_samsung_smdk4412-0d5affcfe23ade8c4c01154e7e381e2a9a916399.tar.gz
kernel_samsung_smdk4412-0d5affcfe23ade8c4c01154e7e381e2a9a916399.tar.bz2
[PATCH] cs89x0: swap {read,write}reg and {read,write}word
Reverse the order of readreg/writereg and readword/writeword in the file, so that we can 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/cs89x0.c')
-rw-r--r--drivers/net/cs89x0.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 04fca31..221f92e 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -339,29 +339,29 @@ out:
#endif
static int
-readreg(struct net_device *dev, int portno)
+readword(unsigned long base_addr, int portno)
{
- outw(portno, dev->base_addr + ADD_PORT);
- return inw(dev->base_addr + DATA_PORT);
+ return inw(base_addr + portno);
}
static void
-writereg(struct net_device *dev, int portno, int value)
+writeword(unsigned long base_addr, int portno, int value)
{
- outw(portno, dev->base_addr + ADD_PORT);
- outw(value, dev->base_addr + DATA_PORT);
+ outw(value, base_addr + portno);
}
static int
-readword(unsigned long base_addr, int portno)
+readreg(struct net_device *dev, int portno)
{
- return inw(base_addr + portno);
+ outw(portno, dev->base_addr + ADD_PORT);
+ return inw(dev->base_addr + DATA_PORT);
}
static void
-writeword(unsigned long base_addr, int portno, int value)
+writereg(struct net_device *dev, int portno, int value)
{
- outw(value, base_addr + portno);
+ outw(portno, dev->base_addr + ADD_PORT);
+ outw(value, dev->base_addr + DATA_PORT);
}
static int __init