diff options
-rw-r--r-- | drivers/net/cs89x0.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index a6078ad9b654..29a7c0cf84bc 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -353,15 +353,15 @@ writereg(struct net_device *dev, int portno, int value) | |||
353 | } | 353 | } |
354 | 354 | ||
355 | static int | 355 | static int |
356 | readword(struct net_device *dev, int portno) | 356 | readword(unsigned long base_addr, int portno) |
357 | { | 357 | { |
358 | return inw(dev->base_addr + portno); | 358 | return inw(base_addr + portno); |
359 | } | 359 | } |
360 | 360 | ||
361 | static void | 361 | static void |
362 | writeword(struct net_device *dev, int portno, int value) | 362 | writeword(unsigned long base_addr, int portno, int value) |
363 | { | 363 | { |
364 | outw(value, dev->base_addr + portno); | 364 | outw(value, base_addr + portno); |
365 | } | 365 | } |
366 | 366 | ||
367 | static int __init | 367 | static int __init |
@@ -1104,8 +1104,8 @@ send_test_pkt(struct net_device *dev) | |||
1104 | memcpy(test_packet, dev->dev_addr, ETH_ALEN); | 1104 | memcpy(test_packet, dev->dev_addr, ETH_ALEN); |
1105 | memcpy(test_packet+ETH_ALEN, dev->dev_addr, ETH_ALEN); | 1105 | memcpy(test_packet+ETH_ALEN, dev->dev_addr, ETH_ALEN); |
1106 | 1106 | ||
1107 | writeword(dev, TX_CMD_PORT, TX_AFTER_ALL); | 1107 | writeword(dev->base_addr, TX_CMD_PORT, TX_AFTER_ALL); |
1108 | writeword(dev, TX_LEN_PORT, ETH_ZLEN); | 1108 | writeword(dev->base_addr, TX_LEN_PORT, ETH_ZLEN); |
1109 | 1109 | ||
1110 | /* Test to see if the chip has allocated memory for the packet */ | 1110 | /* Test to see if the chip has allocated memory for the packet */ |
1111 | while (jiffies - timenow < 5) | 1111 | while (jiffies - timenow < 5) |
@@ -1457,8 +1457,8 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1457 | netif_stop_queue(dev); | 1457 | netif_stop_queue(dev); |
1458 | 1458 | ||
1459 | /* initiate a transmit sequence */ | 1459 | /* initiate a transmit sequence */ |
1460 | writeword(dev, TX_CMD_PORT, lp->send_cmd); | 1460 | writeword(dev->base_addr, TX_CMD_PORT, lp->send_cmd); |
1461 | writeword(dev, TX_LEN_PORT, skb->len); | 1461 | writeword(dev->base_addr, TX_LEN_PORT, skb->len); |
1462 | 1462 | ||
1463 | /* Test to see if the chip has allocated memory for the packet */ | 1463 | /* Test to see if the chip has allocated memory for the packet */ |
1464 | if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) { | 1464 | if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) { |
@@ -1512,7 +1512,7 @@ static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs * regs) | |||
1512 | course, if you're on a slow machine, and packets are arriving | 1512 | course, if you're on a slow machine, and packets are arriving |
1513 | faster than you can read them off, you're screwed. Hasta la | 1513 | faster than you can read them off, you're screwed. Hasta la |
1514 | vista, baby! */ | 1514 | vista, baby! */ |
1515 | while ((status = readword(dev, ISQ_PORT))) { | 1515 | while ((status = readword(dev->base_addr, ISQ_PORT))) { |
1516 | if (net_debug > 4)printk("%s: event=%04x\n", dev->name, status); | 1516 | if (net_debug > 4)printk("%s: event=%04x\n", dev->name, status); |
1517 | handled = 1; | 1517 | handled = 1; |
1518 | switch(status & ISQ_EVENT_MASK) { | 1518 | switch(status & ISQ_EVENT_MASK) { |