renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code

V4L/DVB (11992): Add missing __devexit_p()

Browse Source 
Add missing __devexit_p() to several drivers. Also add a few missing
__init, __devinit and __exit markers. These errors could result in
build failures depending on the kernel configuration.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean Delvare 2009-06-04 11:07:16 -03:00 committed by Mauro Carvalho Chehab
parent 96ceea2734
commit e36bc31f82
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/dvb/bt8xx/bt878.c
View File

@ -508,12 +508,6 @@ static int __devinit bt878_probe(struct pci_dev *dev,
pci_set_master(dev);
pci_set_drvdata(dev, bt);
/* if(init_bt878(btv) < 0) {
bt878_remove(dev);
return -EIO;
}
*/
if ((result = bt878_mem_alloc(bt))) {
printk(KERN_ERR "bt878: failed to allocate memory!\n");
goto fail2;
@ -579,7 +573,7 @@ static struct pci_driver bt878_pci_driver = {
.name = "bt878",
.id_table = bt878_pci_tbl,
.probe = bt878_probe,
.remove = bt878_remove,
.remove = __devexit_p(bt878_remove),
};
static int bt878_pci_driver_registered;

7
drivers/media/video/cx88/cx88-alsa.c
View File

@ -871,7 +871,7 @@ static struct pci_driver cx88_audio_pci_driver = {
.name = "cx88_audio",
.id_table = cx88_audio_pci_tbl,
.probe = cx88_audio_initdev,
.remove = cx88_audio_finidev,
.remove = __devexit_p(cx88_audio_finidev),
};
/****************************************************************************
@ -881,7 +881,7 @@ static struct pci_driver cx88_audio_pci_driver = {
/*
* module init
*/
static int cx88_audio_init(void)
static int __init cx88_audio_init(void)
{
printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n",
(CX88_VERSION_CODE >> 16) & 0xff,
@ -897,9 +897,8 @@ static int cx88_audio_init(void)
/*
* module remove
*/
static void cx88_audio_fini(void)
static void __exit cx88_audio_fini(void)
{
pci_unregister_driver(&cx88_audio_pci_driver);
}

6
drivers/media/video/mx3_camera.c
View File

@ -1074,7 +1074,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = {
.set_bus_param = mx3_camera_set_bus_param,
};
static int mx3_camera_probe(struct platform_device *pdev)
static int __devinit mx3_camera_probe(struct platform_device *pdev)
{
struct mx3_camera_dev *mx3_cam;
struct resource *res;
@ -1194,11 +1194,11 @@ static struct platform_driver mx3_camera_driver = {
.name = MX3_CAM_DRV_NAME,
},
.probe = mx3_camera_probe,
.remove = __exit_p(mx3_camera_remove),
.remove = __devexit_p(mx3_camera_remove),
};
static int __devinit mx3_camera_init(void)
static int __init mx3_camera_init(void)
{
return platform_driver_register(&mx3_camera_driver);
}

6
drivers/media/video/pxa_camera.c
View File

@ -1551,7 +1551,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
.set_bus_param = pxa_camera_set_bus_param,
};
static int pxa_camera_probe(struct platform_device *pdev)
static int __devinit pxa_camera_probe(struct platform_device *pdev)
{
struct pxa_camera_dev *pcdev;
struct resource *res;
@ -1726,11 +1726,11 @@ static struct platform_driver pxa_camera_driver = {
.name = PXA_CAM_DRV_NAME,
},
.probe = pxa_camera_probe,
.remove = __exit_p(pxa_camera_remove),
.remove = __devexit_p(pxa_camera_remove),
};
static int __devinit pxa_camera_init(void)
static int __init pxa_camera_init(void)
{
return platform_driver_register(&pxa_camera_driver);
}

2
drivers/media/video/soc_camera.c
View File

@ -1205,7 +1205,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
static struct platform_driver __refdata soc_camera_pdrv = {
.probe = soc_camera_pdrv_probe,
.remove = __exit_p(soc_camera_pdrv_remove),
.remove = __devexit_p(soc_camera_pdrv_remove),
.driver = {
.name = "soc-camera-pdrv",
.owner = THIS_MODULE,

2
drivers/media/video/usbvision/usbvision-video.c
View File

@ -1794,7 +1794,7 @@ static struct usb_driver usbvision_driver = {
.name = "usbvision",
.id_table = usbvision_table,
.probe = usbvision_probe,
.disconnect = usbvision_disconnect
.disconnect = __devexit_p(usbvision_disconnect),
};
/*

2
drivers/media/video/zoran/zoran_card.c
View File

@ -1477,7 +1477,7 @@ static struct pci_driver zoran_driver = {
.name = "zr36067",
.id_table = zr36067_pci_tbl,
.probe = zoran_probe,
.remove = zoran_remove,
.remove = __devexit_p(zoran_remove),
};
static int __init zoran_init(void)