Commit 9d440a08 authored by Peter Huewe's avatar Peter Huewe Committed by Jiri Kosina

media/video: add __init/__exit macros to various drivers

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of the following drivers in media video:
    drivers/media/video/ivtv/ivtv-driver.c
    drivers/media/video/cx18/cx18-driver.c
    drivers/media/video/davinci/dm355_ccdc.c
    drivers/media/video/davinci/dm644x_ccdc.c
    drivers/media/video/saa7164/saa7164-core.c
    drivers/media/video/saa7134/saa7134-core.c
    drivers/media/video/cx23885/cx23885-core.c
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Acked-by: default avatarAndy Walls <awalls@radix.net>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarMuralidharan Karicheri <m-karicheri2@ti.com>
Acked-By: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 891ddb95
...@@ -1200,7 +1200,7 @@ static struct pci_driver cx18_pci_driver = { ...@@ -1200,7 +1200,7 @@ static struct pci_driver cx18_pci_driver = {
.remove = cx18_remove, .remove = cx18_remove,
}; };
static int module_start(void) static int __init module_start(void)
{ {
printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION);
...@@ -1224,7 +1224,7 @@ static int module_start(void) ...@@ -1224,7 +1224,7 @@ static int module_start(void)
return 0; return 0;
} }
static void module_cleanup(void) static void __exit module_cleanup(void)
{ {
pci_unregister_driver(&cx18_pci_driver); pci_unregister_driver(&cx18_pci_driver);
} }
......
...@@ -1957,7 +1957,7 @@ static struct pci_driver cx23885_pci_driver = { ...@@ -1957,7 +1957,7 @@ static struct pci_driver cx23885_pci_driver = {
.resume = NULL, .resume = NULL,
}; };
static int cx23885_init(void) static int __init cx23885_init(void)
{ {
printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n",
(CX23885_VERSION_CODE >> 16) & 0xff, (CX23885_VERSION_CODE >> 16) & 0xff,
...@@ -1970,7 +1970,7 @@ static int cx23885_init(void) ...@@ -1970,7 +1970,7 @@ static int cx23885_init(void)
return pci_register_driver(&cx23885_pci_driver); return pci_register_driver(&cx23885_pci_driver);
} }
static void cx23885_fini(void) static void __exit cx23885_fini(void)
{ {
pci_unregister_driver(&cx23885_pci_driver); pci_unregister_driver(&cx23885_pci_driver);
} }
......
...@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { ...@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
}, },
}; };
static int dm355_ccdc_init(void) static int __init dm355_ccdc_init(void)
{ {
printk(KERN_NOTICE "dm355_ccdc_init\n"); printk(KERN_NOTICE "dm355_ccdc_init\n");
if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
...@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void) ...@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void)
return 0; return 0;
} }
static void dm355_ccdc_exit(void) static void __exit dm355_ccdc_exit(void)
{ {
vpfe_unregister_ccdc_device(&ccdc_hw_dev); vpfe_unregister_ccdc_device(&ccdc_hw_dev);
} }
......
...@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { ...@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
}, },
}; };
static int dm644x_ccdc_init(void) static int __init dm644x_ccdc_init(void)
{ {
printk(KERN_NOTICE "dm644x_ccdc_init\n"); printk(KERN_NOTICE "dm644x_ccdc_init\n");
if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0)
...@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void) ...@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void)
return 0; return 0;
} }
static void dm644x_ccdc_exit(void) static void __exit dm644x_ccdc_exit(void)
{ {
vpfe_unregister_ccdc_device(&ccdc_hw_dev); vpfe_unregister_ccdc_device(&ccdc_hw_dev);
} }
......
...@@ -1361,7 +1361,7 @@ static struct pci_driver ivtv_pci_driver = { ...@@ -1361,7 +1361,7 @@ static struct pci_driver ivtv_pci_driver = {
.remove = ivtv_remove, .remove = ivtv_remove,
}; };
static int module_start(void) static int __init module_start(void)
{ {
printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION);
...@@ -1385,7 +1385,7 @@ static int module_start(void) ...@@ -1385,7 +1385,7 @@ static int module_start(void)
return 0; return 0;
} }
static void module_cleanup(void) static void __exit module_cleanup(void)
{ {
pci_unregister_driver(&ivtv_pci_driver); pci_unregister_driver(&ivtv_pci_driver);
} }
......
...@@ -1319,7 +1319,7 @@ static struct pci_driver saa7134_pci_driver = { ...@@ -1319,7 +1319,7 @@ static struct pci_driver saa7134_pci_driver = {
#endif #endif
}; };
static int saa7134_init(void) static int __init saa7134_init(void)
{ {
INIT_LIST_HEAD(&saa7134_devlist); INIT_LIST_HEAD(&saa7134_devlist);
printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n",
...@@ -1333,7 +1333,7 @@ static int saa7134_init(void) ...@@ -1333,7 +1333,7 @@ static int saa7134_init(void)
return pci_register_driver(&saa7134_pci_driver); return pci_register_driver(&saa7134_pci_driver);
} }
static void saa7134_fini(void) static void __exit saa7134_fini(void)
{ {
pci_unregister_driver(&saa7134_pci_driver); pci_unregister_driver(&saa7134_pci_driver);
} }
......
...@@ -724,13 +724,13 @@ static struct pci_driver saa7164_pci_driver = { ...@@ -724,13 +724,13 @@ static struct pci_driver saa7164_pci_driver = {
.resume = NULL, .resume = NULL,
}; };
static int saa7164_init(void) static int __init saa7164_init(void)
{ {
printk(KERN_INFO "saa7164 driver loaded\n"); printk(KERN_INFO "saa7164 driver loaded\n");
return pci_register_driver(&saa7164_pci_driver); return pci_register_driver(&saa7164_pci_driver);
} }
static void saa7164_fini(void) static void __exit saa7164_fini(void)
{ {
pci_unregister_driver(&saa7164_pci_driver); pci_unregister_driver(&saa7164_pci_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment