patch-2.4.10 linux/drivers/fc4/soc.c
Next file: linux/drivers/fc4/socal.c
Previous file: linux/drivers/fc4/fc.c
Back to the patch index
Back to the overall index
- Lines: 54
- Date:
Thu Sep 20 14:11:58 2001
- Orig file:
v2.4.9/linux/drivers/fc4/soc.c
- Orig date:
Fri Feb 9 11:30:23 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/fc4/soc.c linux/drivers/fc4/soc.c
@@ -565,14 +565,10 @@
(long)socs, (long)soc_intr, (long)soc_hw_enque))
if (version_printed++ == 0)
printk (version);
-#ifdef MODULE
- s->port[0].fc.module = &__this_module;
- s->port[1].fc.module = &__this_module;
-#else
- s->port[0].fc.module = NULL;
- s->port[1].fc.module = NULL;
-#endif
-
+
+ s->port[0].fc.module = THIS_MODULE;
+ s->port[1].fc.module = THIS_MODULE;
+
s->next = socs;
socs = s;
s->port[0].fc.dev = sdev;
@@ -713,11 +709,7 @@
SOD(("Enabled SOC\n"))
}
-#ifndef MODULE
-int __init soc_probe(void)
-#else
-int init_module(void)
-#endif
+static int __init soc_probe(void)
{
struct sbus_bus *sbus;
struct sbus_dev *sdev = 0;
@@ -741,10 +733,7 @@
return 0;
}
-EXPORT_NO_SYMBOLS;
-
-#ifdef MODULE
-void cleanup_module(void)
+static void __exit soc_cleanup(void)
{
struct soc *s;
int irq;
@@ -770,4 +759,8 @@
s->req_cpu, s->req_dvma);
}
}
-#endif
+
+EXPORT_NO_SYMBOLS;
+
+module_init(soc_probe);
+module_exit(soc_cleanup);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)