Commit 51845e3a authored by Stephen Hemminger's avatar Stephen Hemminger

[NET]: Convert SDLA to new initialization.

Based on Al viro's NE10-sdla
* switched sdla to dynamic allocation
* sdla: embedded ->priv
* sdla: fixed resource leaks on failure exits
Additionally fixes.
* get rid of cli/sti
* get rid of MOD/INC

Builds and probes, but don't have the hardware.
Driver has never built on 2.6 before this.
parent 775b2356
...@@ -98,6 +98,9 @@ extern int macsonic_probe(struct net_device *dev); ...@@ -98,6 +98,9 @@ extern int macsonic_probe(struct net_device *dev);
extern int mac8390_probe(struct net_device *dev); extern int mac8390_probe(struct net_device *dev);
extern int mac89x0_probe(struct net_device *dev); extern int mac89x0_probe(struct net_device *dev);
extern int mc32_probe(struct net_device *dev); extern int mc32_probe(struct net_device *dev);
#ifdef CONFIG_SDLA
extern struct net_device *sdla_init(void);
#endif
/* Detachable devices ("pocket adaptors") */ /* Detachable devices ("pocket adaptors") */
extern int de620_probe(struct net_device *); extern int de620_probe(struct net_device *);
...@@ -385,20 +388,12 @@ static int __init ethif_probe(struct net_device *dev) ...@@ -385,20 +388,12 @@ static int __init ethif_probe(struct net_device *dev)
/* Statically configured drivers -- order matters here. */ /* Statically configured drivers -- order matters here. */
void probe_old_netdevs(void) void probe_old_netdevs(void)
{ {
}
#ifdef CONFIG_SDLA #ifdef CONFIG_SDLA
extern int sdla_init(struct net_device *); sdla_init();
static struct net_device sdla0_dev = {
.name = "sdla0",
.next = NEXT_DEV,
.init = sdla_init,
};
#undef NEXT_DEV
#define NEXT_DEV (&sdla0_dev)
#endif #endif
}
#if defined(CONFIG_LTPC) #if defined(CONFIG_LTPC)
extern int ltpc_probe(struct net_device *); extern int ltpc_probe(struct net_device *);
static struct net_device dev_ltpc = { static struct net_device dev_ltpc = {
......
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