patch-2.4.0-test11 linux/drivers/media/radio/radio-maestro.c

• Lines: 58
• Date: Fri Nov 17 17:56:51 2000
• Orig file: v2.4.0-test10/linux/drivers/media/radio/radio-maestro.c
• Orig date: Sun Oct 8 10:50:18 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/radio/radio-maestro.c linux/drivers/media/radio/radio-maestro.c
@@ -69,17 +69,12 @@
 
 static struct video_device maestro_radio=
 {
-	"Maestro radio",
-	VID_TYPE_TUNER,
-	VID_HARDWARE_SF16MI,
-	radio_open,
-	radio_close,
-	NULL,
-	NULL,
-	NULL,
-	radio_ioctl,
-	NULL,
-	NULL
+	name:		"Maestro radio",
+	type:		VID_TYPE_TUNER,
+	hardware:	VID_HARDWARE_SF16MI,
+	open:		radio_open,
+	close:		radio_close,
+	ioctl:		radio_ioctl,
 };
 
 static struct radio_device
@@ -300,21 +295,17 @@
 
 inline static __u16 radio_install(struct pci_dev *pcidev);
 
-#ifdef MODULE
 MODULE_AUTHOR("Adam Tlalka, atlka@pg.gda.pl");
 MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
 
 EXPORT_NO_SYMBOLS;
 
-void cleanup_module(void)
+void __exit maestro_radio_exit(void)
 {
 	video_unregister_device(&maestro_radio);
 }
 
-int init_module(void)
-#else
-int __init maestro_radio_init(struct video_init *v)
-#endif
+int __init maestro_radio_init(void)
 {
 	register __u16 found=0;
 	struct pci_dev *pcidev = NULL;
@@ -334,6 +325,9 @@
 	}
 	return 0;
 }
+
+module_init(maestro_radio_init);
+module_exit(maestro_radio_exit);
 
 inline static __u16 radio_power_on(struct radio_device *dev)
 {