projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] dm mirror log: bitset_size fix
[powerpc.git]
/
drivers
/
net
/
tokenring
/
olympic.c
diff --git
a/drivers/net/tokenring/olympic.c
b/drivers/net/tokenring/olympic.c
index
05477d2
..
c3cb8d2
100644
(file)
--- a/
drivers/net/tokenring/olympic.c
+++ b/
drivers/net/tokenring/olympic.c
@@
-100,6
+100,7
@@
#include <linux/pci.h>
#include <linux/spinlock.h>
#include <linux/bitops.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
#include <linux/bitops.h>
+#include <linux/jiffies.h>
#include <net/checksum.h>
#include <net/checksum.h>
@@
-216,7
+217,7
@@
static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
dev = alloc_trdev(sizeof(struct olympic_private)) ;
if (!dev) {
i = -ENOMEM;
dev = alloc_trdev(sizeof(struct olympic_private)) ;
if (!dev) {
i = -ENOMEM;
- goto op_
fre
e_dev;
+ goto op_
releas
e_dev;
}
olympic_priv = dev->priv ;
}
olympic_priv = dev->priv ;
@@
-281,8
+282,8
@@
op_free_iomap:
if (olympic_priv->olympic_lap)
iounmap(olympic_priv->olympic_lap);
if (olympic_priv->olympic_lap)
iounmap(olympic_priv->olympic_lap);
-op_free_dev:
free_netdev(dev);
free_netdev(dev);
+op_release_dev:
pci_release_regions(pdev);
op_disable_dev:
pci_release_regions(pdev);
op_disable_dev:
@@
-307,7
+308,7
@@
static int __devinit olympic_init(struct net_device *dev)
t=jiffies;
while((readl(olympic_mmio+BCTL)) & BCTL_SOFTRESET) {
schedule();
t=jiffies;
while((readl(olympic_mmio+BCTL)) & BCTL_SOFTRESET) {
schedule();
- if(
jiffies-t > 40*HZ
) {
+ if(
time_after(jiffies, t + 40*HZ)
) {
printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
return -ENODEV;
}
printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
return -ENODEV;
}
@@
-359,7
+360,7
@@
static int __devinit olympic_init(struct net_device *dev)
t=jiffies;
while (!readl(olympic_mmio+CLKCTL) & CLKCTL_PAUSE) {
schedule() ;
t=jiffies;
while (!readl(olympic_mmio+CLKCTL) & CLKCTL_PAUSE) {
schedule() ;
- if(
jiffies-t > 2*HZ) {
+ if(
time_after(jiffies, t + 2*HZ)) {
printk(KERN_ERR "IBM Cardbus tokenring adapter not responsing.\n") ;
return -ENODEV;
}
printk(KERN_ERR "IBM Cardbus tokenring adapter not responsing.\n") ;
return -ENODEV;
}
@@
-373,7
+374,7
@@
static int __devinit olympic_init(struct net_device *dev)
t=jiffies;
while(!((readl(olympic_mmio+SISR_RR)) & SISR_SRB_REPLY)) {
schedule();
t=jiffies;
while(!((readl(olympic_mmio+SISR_RR)) & SISR_SRB_REPLY)) {
schedule();
- if(
jiffies-t > 15*HZ
) {
+ if(
time_after(jiffies, t + 15*HZ)
) {
printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
return -ENODEV;
}
printk(KERN_ERR "IBM PCI tokenring card not responding.\n");
return -ENODEV;
}
@@
-519,7
+520,7
@@
static int olympic_open(struct net_device *dev)
olympic_priv->srb_queued=0;
break;
}
olympic_priv->srb_queued=0;
break;
}
- if (
(jiffies-t) > 10*HZ) {
+ if (
time_after(jiffies, t + 10*HZ)) {
printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ;
olympic_priv->srb_queued=0;
break ;
printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ;
olympic_priv->srb_queued=0;
break ;