Commit 39ba9a4b authored by Christoph Hellwig's avatar Christoph Hellwig

[NET]: Move iph5526_probe to initcalls.

parent be583732
...@@ -398,24 +398,6 @@ static int __init ethif_probe(struct net_device *dev) ...@@ -398,24 +398,6 @@ static int __init ethif_probe(struct net_device *dev)
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_NET_FC
static int fcif_probe(struct net_device *dev)
{
if (dev->base_addr == -1)
return 1;
if (1
#ifdef CONFIG_IPHASE5526
&& iph5526_probe(dev)
#endif
&& 1 ) {
return 1; /* -ENODEV or -EAGAIN would be more accurate. */
}
return 0;
}
#endif /* CONFIG_NET_FC */
#ifdef CONFIG_ETHERTAP #ifdef CONFIG_ETHERTAP
static struct net_device tap0_dev = { static struct net_device tap0_dev = {
.name = "tap0", .name = "tap0",
...@@ -589,22 +571,6 @@ static struct net_device tr0_dev = { ...@@ -589,22 +571,6 @@ static struct net_device tr0_dev = {
#endif #endif
#ifdef CONFIG_NET_FC
static struct net_device fc1_dev = {
.name = "fc1",
.next = NEXT_DEV,
.init = fcif_probe
};
static struct net_device fc0_dev = {
.name = "fc0",
.next = &fc1_dev,
.init = fcif_probe
};
#undef NEXT_DEV
#define NEXT_DEV (&fc0_dev)
#endif
#ifdef CONFIG_SBNI #ifdef CONFIG_SBNI
static struct net_device sbni7_dev = { static struct net_device sbni7_dev = {
.name = "sbni7", .name = "sbni7",
......
...@@ -239,19 +239,7 @@ int __init iph5526_probe(struct net_device *dev) ...@@ -239,19 +239,7 @@ int __init iph5526_probe(struct net_device *dev)
static int __init iph5526_probe_pci(struct net_device *dev) static int __init iph5526_probe_pci(struct net_device *dev)
{ {
#ifdef MODULE
struct fc_info *fi = (struct fc_info *)dev->priv; struct fc_info *fi = (struct fc_info *)dev->priv;
#else
struct fc_info *fi = fc[count];
static int count;
int err;
if (!fi)
return -ENODEV;
fc_setup(dev);
count++;
#endif
fi->dev = dev; fi->dev = dev;
dev->base_addr = fi->base_addr; dev->base_addr = fi->base_addr;
dev->irq = fi->irq; dev->irq = fi->irq;
...@@ -4479,8 +4467,6 @@ static char buf[80]; ...@@ -4479,8 +4467,6 @@ static char buf[80];
return buf; return buf;
} }
#ifdef MODULE
#define NAMELEN 8 /* # of chars for storing dev->name */ #define NAMELEN 8 /* # of chars for storing dev->name */
static struct net_device *dev_fc[MAX_FC_CARDS]; static struct net_device *dev_fc[MAX_FC_CARDS];
...@@ -4491,7 +4477,7 @@ static int bad; /* 0xbad = bad sig or no reset ack */ ...@@ -4491,7 +4477,7 @@ static int bad; /* 0xbad = bad sig or no reset ack */
static int scsi_registered; static int scsi_registered;
int init_module(void) static int __init iph5526_init(void)
{ {
int i = 0; int i = 0;
...@@ -4530,7 +4516,7 @@ int init_module(void) ...@@ -4530,7 +4516,7 @@ int init_module(void)
return 0; return 0;
} }
void cleanup_module(void) static void __exit iph5526_exit(void)
{ {
int i = 0; int i = 0;
while(fc[i] != NULL) { while(fc[i] != NULL) {
...@@ -4549,7 +4535,9 @@ void cleanup_module(void) ...@@ -4549,7 +4535,9 @@ void cleanup_module(void)
if (scsi_registered == TRUE) if (scsi_registered == TRUE)
scsi_unregister_host(&driver_template); scsi_unregister_host(&driver_template);
} }
#endif /* MODULE */
module_init(iph5526_init);
module_exit(iph5526_exit);
void clean_up_memory(struct fc_info *fi) void clean_up_memory(struct fc_info *fi)
{ {
......
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