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
/
3c523.c
diff --git
a/drivers/net/3c523.c
b/drivers/net/3c523.c
index
5dfd97f
..
9e1fe2e
100644
(file)
--- a/
drivers/net/3c523.c
+++ b/
drivers/net/3c523.c
@@
-105,7
+105,6
@@
#include <linux/mca-legacy.h>
#include <linux/ethtool.h>
#include <linux/bitops.h>
#include <linux/mca-legacy.h>
#include <linux/ethtool.h>
#include <linux/bitops.h>
-#include <linux/jiffies.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
@@
-289,7
+288,7
@@
static int elmc_open(struct net_device *dev)
elmc_id_attn586(); /* disable interrupts */
elmc_id_attn586(); /* disable interrupts */
- ret = request_irq(dev->irq, &elmc_interrupt,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM,
+ ret = request_irq(dev->irq, &elmc_interrupt,
SA_SHIRQ | SA
_SAMPLE_RANDOM,
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
@@
-659,7
+658,7
@@
static int init586(struct net_device *dev)
s = jiffies; /* warning: only active with interrupts on !! */
while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
s = jiffies; /* warning: only active with interrupts on !! */
while (!(cfg_cmd->cmd_status & STAT_COMPL)) {
- if (
time_after(jiffies, s + 30*HZ/100)
)
+ if (
jiffies - s > 30*HZ/100
)
break;
}
break;
}
@@
-685,7
+684,7
@@
static int init586(struct net_device *dev)
s = jiffies;
while (!(ias_cmd->cmd_status & STAT_COMPL)) {
s = jiffies;
while (!(ias_cmd->cmd_status & STAT_COMPL)) {
- if (
time_after(jiffies, s + 30*HZ/100)
)
+ if (
jiffies - s > 30*HZ/100
)
break;
}
break;
}
@@
-710,7
+709,7
@@
static int init586(struct net_device *dev)
s = jiffies;
while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
s = jiffies;
while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
- if (
time_after(jiffies, s + 30*HZ/100)
) {
+ if (
jiffies - s > 30*HZ/100
) {
printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
result = 1;
break;
printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
result = 1;
break;
@@
-799,7
+798,7
@@
static int init586(struct net_device *dev)
elmc_id_attn586();
s = jiffies;
while (!(mc_cmd->cmd_status & STAT_COMPL)) {
elmc_id_attn586();
s = jiffies;
while (!(mc_cmd->cmd_status & STAT_COMPL)) {
- if (
time_after(jiffies, s + 30*HZ/100)
)
+ if (
jiffies - s > 30*HZ/100
)
break;
}
if (!(mc_cmd->cmd_status & STAT_COMPL)) {
break;
}
if (!(mc_cmd->cmd_status & STAT_COMPL)) {
@@
-1277,7
+1276,7
@@
MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");
MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
MODULE_LICENSE("GPL");
-int
__init
init_module(void)
+int init_module(void)
{
int this_dev,found = 0;
{
int this_dev,found = 0;