From b5b7b150f3d92b7b3cc3db5f013ffc2ce5cbd40c Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Sun, 8 Jan 2006 01:01:10 -0800 Subject: [PATCH] --- yaml --- r: 16859 b: refs/heads/master c: 3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5 h: refs/heads/master i: 16857: d45a12819e8d5dcc8c179c55361feccf94fd2660 16855: 81e9454c62b2ffa14825d694e525cdd353c97465 v: v3 --- [refs] | 2 +- trunk/drivers/net/cs89x0.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e45c1289c4d2..7f3f44702c2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d5affcfe23ade8c4c01154e7e381e2a9a916399 +refs/heads/master: 3eaa5e7dcce0653d2bfd2ab85a623687da49f8d5 diff --git a/trunk/drivers/net/cs89x0.c b/trunk/drivers/net/cs89x0.c index 221f92e45ec7..756d80adc47b 100644 --- a/trunk/drivers/net/cs89x0.c +++ b/trunk/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