git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Staging: comedi: ni_labbc_cs: cleaned up debug define a bit
[safe/jmp/linux-2.6]
/
drivers
/
net
/
smc-mca.c
diff --git
a/drivers/net/smc-mca.c
b/drivers/net/smc-mca.c
index
8d36d40
..
a93f122
100644
(file)
--- a/
drivers/net/smc-mca.c
+++ b/
drivers/net/smc-mca.c
@@
-268,9
+268,9
@@
static int __init ultramca_probe(struct device *gen_dev)
}
}
}
}
- if(!tirq || !tbase
- || (irq && irq != tirq)
-
||
(base_addr && tbase != base_addr))
+ if(!tirq || !tbase
||
+ (irq && irq != tirq) ||
+ (base_addr && tbase != base_addr))
/* FIXME: we're trying to force the ordering of the
* devices here, there should be a way of getting this
* to happen */
/* FIXME: we're trying to force the ordering of the
* devices here, there should be a way of getting this
* to happen */
@@
-370,7
+370,7
@@
static int __init ultramca_probe(struct device *gen_dev)
outb(reg4, ioaddr + 4);
outb(reg4, ioaddr + 4);
-
gen_dev->driver_data = dev
;
+
dev_set_drvdata(gen_dev, dev)
;
/* The 8390 isn't at the base address, so fake the offset
*/
/* The 8390 isn't at the base address, so fake the offset
*/
@@
-531,7
+531,7
@@
static int ultramca_close_card(struct net_device *dev)
static int ultramca_remove(struct device *gen_dev)
{
struct mca_device *mca_dev = to_mca_device(gen_dev);
static int ultramca_remove(struct device *gen_dev)
{
struct mca_device *mca_dev = to_mca_device(gen_dev);
- struct net_device *dev =
(struct net_device *)gen_dev->driver_data
;
+ struct net_device *dev =
dev_get_drvdata(gen_dev)
;
if (dev) {
/* NB: ultra_close_card() does free_irq */
if (dev) {
/* NB: ultra_close_card() does free_irq */