Commit 3a585bf5 authored by Marc Zyngier's avatar Marc Zyngier Committed by Linus Torvalds

[netdrvr de4x5] big modernization / cleanup

The enclosed patch tries to clean the tulip de4x5 driver, and update
it to some of the 2.6 APIs :

- Use PCI and EISA probing APIs
- Use generic DMA API
- Fix DE425 init on the Jensen
- Remove de4x5 from Space.c

It's been tested on x86 and Alpha, with a DE425 (21040, EISA), a DE435
(21040, PCI) and a quad DLink (4*21143, PCI).

The major problem with this patch is that, because of the Space.c
removal, interfaces get potentially renumbered. This has been
discussed to death on lkml, without any obvious solution. IMHO, we'd
better remove as many drivers as we can from Space.c before
2.6.0-final ships...
parent 7c219ac7
...@@ -62,7 +62,6 @@ extern int eth16i_probe(struct net_device *); ...@@ -62,7 +62,6 @@ extern int eth16i_probe(struct net_device *);
extern int depca_probe(struct net_device *); extern int depca_probe(struct net_device *);
extern int i82596_probe(struct net_device *); extern int i82596_probe(struct net_device *);
extern int ewrk3_probe(struct net_device *); extern int ewrk3_probe(struct net_device *);
extern int de4x5_probe(struct net_device *);
extern int el1_probe(struct net_device *); extern int el1_probe(struct net_device *);
extern int wavelan_probe(struct net_device *); extern int wavelan_probe(struct net_device *);
extern int arlan_probe(struct net_device *); extern int arlan_probe(struct net_device *);
...@@ -152,12 +151,9 @@ static int __init probe_list(struct net_device *dev, struct devprobe *plist) ...@@ -152,12 +151,9 @@ static int __init probe_list(struct net_device *dev, struct devprobe *plist)
* This is a bit of an artificial separation as there are PCI drivers * This is a bit of an artificial separation as there are PCI drivers
* that also probe for EISA cards (in the PCI group) and there are ISA * that also probe for EISA cards (in the PCI group) and there are ISA
* drivers that probe for EISA cards (in the ISA group). These are the * drivers that probe for EISA cards (in the ISA group). These are the
* EISA only driver probes, and also the legacy PCI probes * legacy EISA only driver probes, and also the legacy PCI probes
*/ */
static struct devprobe eisa_probes[] __initdata = { static struct devprobe eisa_probes[] __initdata = {
#ifdef CONFIG_DE4X5 /* DEC DE425, DE434, DE435 adapters */
{de4x5_probe, 0},
#endif
#ifdef CONFIG_ULTRA32 #ifdef CONFIG_ULTRA32
{ultra32_probe, 0}, {ultra32_probe, 0},
#endif #endif
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment