From 5ce98017047b2df9e728c214da322840081dabb6 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Sun, 8 Jan 2006 01:01:09 -0800 Subject: [PATCH] --- yaml --- r: 16858 b: refs/heads/master c: 0d5affcfe23ade8c4c01154e7e381e2a9a916399 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cs89x0.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index fb6549dbd426..e45c1289c4d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc8c7d79b117f7a5b17640bf657d95afe4025bb8 +refs/heads/master: 0d5affcfe23ade8c4c01154e7e381e2a9a916399 diff --git a/trunk/drivers/net/cs89x0.c b/trunk/drivers/net/cs89x0.c index 04fca31f1733..221f92e45ec7 100644 --- a/trunk/drivers/net/cs89x0.c +++ b/trunk/drivers/net/cs89x0.c @@ -339,29 +339,29 @@ struct net_device * __init cs89x0_probe(int unit) #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