patch-2.3.26 linux/drivers/char/c-qcam.c

• Lines: 40
• Date: Tue Nov 2 21:35:46 1999
• Orig file: v2.3.25/linux/drivers/char/c-qcam.c
• Orig date: Mon Oct 4 15:49:29 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/char/c-qcam.c linux/drivers/char/c-qcam.c
@@ -753,33 +753,21 @@
 	NULL
 };
 
-static void cqcam_init(void)
+static int __init cqcam_init (void)
 {
 	printk(BANNER "\n");
-	parport_register_driver(&cqcam_driver);
+	return parport_register_driver(&cqcam_driver);
 }
 
-#ifdef MODULE
-
 MODULE_AUTHOR("Philip Blundell <philb@gnu.org>");
 MODULE_DESCRIPTION(BANNER);
 
-int init_module(void)
-{
-	cqcam_init();
-	return 0;
-}
-
-void cleanup_module(void)
+static void __exit cqcam_cleanup (void)
 {
 	unsigned int i;
 	for (i = 0; i < num_cams; i++)
 		close_cqcam(qcams[i]);
 }
-#else
-int __init init_colour_qcams(struct video_init *unused)
-{
-	cqcam_init();
-	return 0;
-}
-#endif
+
+module_init(cqcam_init);
+module_exit(cqcam_cleanup);