git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
zorro8390.c
diff --git
a/drivers/net/zorro8390.c
b/drivers/net/zorro8390.c
index
8037e58
..
8ab6e12
100644
(file)
--- a/
drivers/net/zorro8390.c
+++ b/
drivers/net/zorro8390.c
@@
-27,7
+27,6
@@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/zorro.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/zorro.h>
-#include <linux/jiffies.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/irq.h>
@@
-152,7
+151,7
@@
static int __devinit zorro8390_init(struct net_device *dev,
z_writeb(z_readb(ioaddr + NE_RESET), ioaddr + NE_RESET);
while ((z_readb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
z_writeb(z_readb(ioaddr + NE_RESET), ioaddr + NE_RESET);
while ((z_readb(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(KERN_WARNING " not found (no reset ack).\n");
return -ENODEV;
}
printk(KERN_WARNING " not found (no reset ack).\n");
return -ENODEV;
}
@@
-274,7
+273,7
@@
static void zorro8390_reset_8390(struct net_device *dev)
/* This check _should_not_ be necessary, omit eventually. */
while ((z_readb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
/* This check _should_not_ be necessary, omit eventually. */
while ((z_readb(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(KERN_WARNING "%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n",
dev->name);
break;
@@
-401,7
+400,7
@@
static void zorro8390_block_output(struct net_device *dev, int count,
dma_start = jiffies;
while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
dma_start = jiffies;
while ((z_readb(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(KERN_ERR "%s: timeout waiting for Tx RDC.\n",
dev->name);
zorro8390_reset_8390(dev);
printk(KERN_ERR "%s: timeout waiting for Tx RDC.\n",
dev->name);
zorro8390_reset_8390(dev);
@@
-426,7
+425,7
@@
static void __devexit zorro8390_remove_one(struct zorro_dev *z)
static int __init zorro8390_init_module(void)
{
static int __init zorro8390_init_module(void)
{
- return zorro_
register_driver
(&zorro8390_driver);
+ return zorro_
module_init
(&zorro8390_driver);
}
static void __exit zorro8390_cleanup_module(void)
}
static void __exit zorro8390_cleanup_module(void)