diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/davinci/dm355_ccdc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/davinci/dm644x_ccdc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7164/saa7164-core.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 6dd51e27582c..e12082b8a08d 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -1200,7 +1200,7 @@ static struct pci_driver cx18_pci_driver = { | |||
1200 | .remove = cx18_remove, | 1200 | .remove = cx18_remove, |
1201 | }; | 1201 | }; |
1202 | 1202 | ||
1203 | static int module_start(void) | 1203 | static int __init module_start(void) |
1204 | { | 1204 | { |
1205 | printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); | 1205 | printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); |
1206 | 1206 | ||
@@ -1224,7 +1224,7 @@ static int module_start(void) | |||
1224 | return 0; | 1224 | return 0; |
1225 | } | 1225 | } |
1226 | 1226 | ||
1227 | static void module_cleanup(void) | 1227 | static void __exit module_cleanup(void) |
1228 | { | 1228 | { |
1229 | pci_unregister_driver(&cx18_pci_driver); | 1229 | pci_unregister_driver(&cx18_pci_driver); |
1230 | } | 1230 | } |
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index e34a4ec4a2cd..e8eb4ec0c30a 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c | |||
@@ -2026,7 +2026,7 @@ static struct pci_driver cx23885_pci_driver = { | |||
2026 | .resume = NULL, | 2026 | .resume = NULL, |
2027 | }; | 2027 | }; |
2028 | 2028 | ||
2029 | static int cx23885_init(void) | 2029 | static int __init cx23885_init(void) |
2030 | { | 2030 | { |
2031 | printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", | 2031 | printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", |
2032 | (CX23885_VERSION_CODE >> 16) & 0xff, | 2032 | (CX23885_VERSION_CODE >> 16) & 0xff, |
@@ -2039,7 +2039,7 @@ static int cx23885_init(void) | |||
2039 | return pci_register_driver(&cx23885_pci_driver); | 2039 | return pci_register_driver(&cx23885_pci_driver); |
2040 | } | 2040 | } |
2041 | 2041 | ||
2042 | static void cx23885_fini(void) | 2042 | static void __exit cx23885_fini(void) |
2043 | { | 2043 | { |
2044 | pci_unregister_driver(&cx23885_pci_driver); | 2044 | pci_unregister_driver(&cx23885_pci_driver); |
2045 | } | 2045 | } |
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c index 4629cabe3f28..56fbefe036ae 100644 --- a/drivers/media/video/davinci/dm355_ccdc.c +++ b/drivers/media/video/davinci/dm355_ccdc.c | |||
@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { | |||
959 | }, | 959 | }, |
960 | }; | 960 | }; |
961 | 961 | ||
962 | static int dm355_ccdc_init(void) | 962 | static int __init dm355_ccdc_init(void) |
963 | { | 963 | { |
964 | printk(KERN_NOTICE "dm355_ccdc_init\n"); | 964 | printk(KERN_NOTICE "dm355_ccdc_init\n"); |
965 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) | 965 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) |
@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void) | |||
969 | return 0; | 969 | return 0; |
970 | } | 970 | } |
971 | 971 | ||
972 | static void dm355_ccdc_exit(void) | 972 | static void __exit dm355_ccdc_exit(void) |
973 | { | 973 | { |
974 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); | 974 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); |
975 | } | 975 | } |
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c index 2f19a919f477..d5fa193f32d2 100644 --- a/drivers/media/video/davinci/dm644x_ccdc.c +++ b/drivers/media/video/davinci/dm644x_ccdc.c | |||
@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { | |||
859 | }, | 859 | }, |
860 | }; | 860 | }; |
861 | 861 | ||
862 | static int dm644x_ccdc_init(void) | 862 | static int __init dm644x_ccdc_init(void) |
863 | { | 863 | { |
864 | printk(KERN_NOTICE "dm644x_ccdc_init\n"); | 864 | printk(KERN_NOTICE "dm644x_ccdc_init\n"); |
865 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) | 865 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) |
@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void) | |||
869 | return 0; | 869 | return 0; |
870 | } | 870 | } |
871 | 871 | ||
872 | static void dm644x_ccdc_exit(void) | 872 | static void __exit dm644x_ccdc_exit(void) |
873 | { | 873 | { |
874 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); | 874 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); |
875 | } | 875 | } |
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 463ec3457d7b..7cdbc1a8f218 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -1361,7 +1361,7 @@ static struct pci_driver ivtv_pci_driver = { | |||
1361 | .remove = ivtv_remove, | 1361 | .remove = ivtv_remove, |
1362 | }; | 1362 | }; |
1363 | 1363 | ||
1364 | static int module_start(void) | 1364 | static int __init module_start(void) |
1365 | { | 1365 | { |
1366 | printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); | 1366 | printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); |
1367 | 1367 | ||
@@ -1385,7 +1385,7 @@ static int module_start(void) | |||
1385 | return 0; | 1385 | return 0; |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | static void module_cleanup(void) | 1388 | static void __exit module_cleanup(void) |
1389 | { | 1389 | { |
1390 | pci_unregister_driver(&ivtv_pci_driver); | 1390 | pci_unregister_driver(&ivtv_pci_driver); |
1391 | } | 1391 | } |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 9a5df930885b..0ba7f5af0fc3 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1319,7 +1319,7 @@ static struct pci_driver saa7134_pci_driver = { | |||
1319 | #endif | 1319 | #endif |
1320 | }; | 1320 | }; |
1321 | 1321 | ||
1322 | static int saa7134_init(void) | 1322 | static int __init saa7134_init(void) |
1323 | { | 1323 | { |
1324 | INIT_LIST_HEAD(&saa7134_devlist); | 1324 | INIT_LIST_HEAD(&saa7134_devlist); |
1325 | printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", | 1325 | printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", |
@@ -1333,7 +1333,7 @@ static int saa7134_init(void) | |||
1333 | return pci_register_driver(&saa7134_pci_driver); | 1333 | return pci_register_driver(&saa7134_pci_driver); |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | static void saa7134_fini(void) | 1336 | static void __exit saa7134_fini(void) |
1337 | { | 1337 | { |
1338 | pci_unregister_driver(&saa7134_pci_driver); | 1338 | pci_unregister_driver(&saa7134_pci_driver); |
1339 | } | 1339 | } |
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index 709affc31042..e6aa0fbd1e91 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c | |||
@@ -724,13 +724,13 @@ static struct pci_driver saa7164_pci_driver = { | |||
724 | .resume = NULL, | 724 | .resume = NULL, |
725 | }; | 725 | }; |
726 | 726 | ||
727 | static int saa7164_init(void) | 727 | static int __init saa7164_init(void) |
728 | { | 728 | { |
729 | printk(KERN_INFO "saa7164 driver loaded\n"); | 729 | printk(KERN_INFO "saa7164 driver loaded\n"); |
730 | return pci_register_driver(&saa7164_pci_driver); | 730 | return pci_register_driver(&saa7164_pci_driver); |
731 | } | 731 | } |
732 | 732 | ||
733 | static void saa7164_fini(void) | 733 | static void __exit saa7164_fini(void) |
734 | { | 734 | { |
735 | pci_unregister_driver(&saa7164_pci_driver); | 735 | pci_unregister_driver(&saa7164_pci_driver); |
736 | } | 736 | } |