linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / apne.c

diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 9cc13a0..a94216b 100644 (file)
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -36,7 +36,6 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/jiffies.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -217,7 +216,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
        outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);
 
        while ((inb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
-               if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
+               if (jiffies - reset_start_time > 2*HZ/100) {
                        printk(" not found (no reset ack).\n");
                        return -ENODEV;
                }
@@ -313,7 +312,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     dev->base_addr = ioaddr;
 
     /* Install the Interrupt handler */
-    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
+    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, DRV_NAME, dev);
     if (i) return i;
 
     for(i = 0; i < ETHER_ADDR_LEN; i++) {
@@ -383,7 +382,7 @@ apne_reset_8390(struct net_device *dev)
 
     /* This check _should_not_ be necessary, omit eventually. */
     while ((inb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
-       if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
+       if (jiffies - reset_start_time > 2*HZ/100) {
            printk("%s: ne_reset_8390() did not complete.\n", dev->name);
            break;
        }
@@ -531,7 +530,7 @@ apne_block_output(struct net_device *dev, int count,
     dma_start = jiffies;
 
     while ((inb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
-       if (time_after(jiffies, dma_start + 2*HZ/100)) {        /* 20ms */
+       if (jiffies - dma_start > 2*HZ/100) {           /* 20ms */
                printk("%s: timeout waiting for Tx RDC.\n", dev->name);
                apne_reset_8390(dev);
                NS8390_init(dev,1);