[LV-kern-commit] CVS: kernel-2.4/drivers/fc4 Makefile,1.1.1.1,1.2 fc.c,1.1.1.2,1.2 soc.c,1.1.1.2,1.2 socal.c,1.1.1.2,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/fc4
In directory usw-pr-cvs1:/tmp/cvs-serv26834/drivers/fc4

Modified Files:
	Makefile fc.c soc.c socal.c 
Log Message:
synch 2.4.15 commit 56


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/fc4/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	14 Jan 2001 18:58:22 -0000	1.1.1.1
+++ Makefile	11 Apr 2002 14:27:00 -0000	1.2
@@ -14,7 +14,7 @@
 obj-$(CONFIG_FC4_SOC) += soc.o
 obj-$(CONFIG_FC4_SOCAL) += socal.o
 
+include $(TOPDIR)/Rules.make
+
 fc4.o: $(fc4-objs)
 	$(LD) -r -o $@ $(fc4-objs)
-
-include $(TOPDIR)/Rules.make

Index: fc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/fc4/fc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- fc.c	25 Feb 2001 23:15:12 -0000	1.1.1.2
+++ fc.c	11 Apr 2002 14:27:00 -0000	1.2
@@ -1155,14 +1155,3 @@
 	kfree(p);
 	return status;
 }
-
-#ifdef MODULE
-int init_module(void)
-{
-	return 0;
-}
-
-void cleanup_module(void)
-{
-}
-#endif

Index: soc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/fc4/soc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- soc.c	25 Feb 2001 23:15:12 -0000	1.1.1.2
+++ soc.c	11 Apr 2002 14:27:00 -0000	1.2
@@ -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,9 @@
 				     s->req_cpu, s->req_dvma);
 	}
 }
-#endif
+
+EXPORT_NO_SYMBOLS;
+
+module_init(soc_probe);
+module_exit(soc_cleanup);
+MODULE_LICENSE("GPL");

Index: socal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/fc4/socal.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- socal.c	25 Feb 2001 23:15:12 -0000	1.1.1.2
+++ socal.c	11 Apr 2002 14:27:00 -0000	1.2
@@ -673,14 +673,10 @@
 	     (long)socals, (long)socal_intr, (long)socal_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 = socals;
 	socals = s;
 	s->port[0].fc.dev = sdev;
@@ -850,11 +846,7 @@
 	SOD(("Enabled SOCAL\n"))
 }
 
-#ifndef MODULE
-int __init socal_probe(void)
-#else
-int init_module(void)
-#endif
+static int __init socal_probe(void)
 {
 	struct sbus_bus *sbus;
 	struct sbus_dev *sdev = 0;
@@ -880,10 +872,7 @@
 	return 0;
 }
 
-EXPORT_NO_SYMBOLS;
-
-#ifdef MODULE
-void cleanup_module(void)
+static void __exit socal_cleanup(void)
 {
 	struct socal *s;
 	int irq;
@@ -910,4 +899,9 @@
 				     s->req_cpu, s->req_dvma);
 	}
 }
-#endif
+
+EXPORT_NO_SYMBOLS;
+
+module_init(socal_probe);
+module_exit(socal_cleanup);
+MODULE_LICENSE("GPL");