提交 e36bc31f 编写于 作者: J Jean Delvare 提交者: Mauro Carvalho Chehab

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

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: NJean Delvare <khali@linux-fr.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 96ceea27
...@@ -508,12 +508,6 @@ static int __devinit bt878_probe(struct pci_dev *dev, ...@@ -508,12 +508,6 @@ static int __devinit bt878_probe(struct pci_dev *dev,
pci_set_master(dev); pci_set_master(dev);
pci_set_drvdata(dev, bt); pci_set_drvdata(dev, bt);
/* if(init_bt878(btv) < 0) {
bt878_remove(dev);
return -EIO;
}
*/
if ((result = bt878_mem_alloc(bt))) { if ((result = bt878_mem_alloc(bt))) {
printk(KERN_ERR "bt878: failed to allocate memory!\n"); printk(KERN_ERR "bt878: failed to allocate memory!\n");
goto fail2; goto fail2;
...@@ -579,7 +573,7 @@ static struct pci_driver bt878_pci_driver = { ...@@ -579,7 +573,7 @@ static struct pci_driver bt878_pci_driver = {
.name = "bt878", .name = "bt878",
.id_table = bt878_pci_tbl, .id_table = bt878_pci_tbl,
.probe = bt878_probe, .probe = bt878_probe,
.remove = bt878_remove, .remove = __devexit_p(bt878_remove),
}; };
static int bt878_pci_driver_registered; static int bt878_pci_driver_registered;
......
...@@ -871,7 +871,7 @@ static struct pci_driver cx88_audio_pci_driver = { ...@@ -871,7 +871,7 @@ static struct pci_driver cx88_audio_pci_driver = {
.name = "cx88_audio", .name = "cx88_audio",
.id_table = cx88_audio_pci_tbl, .id_table = cx88_audio_pci_tbl,
.probe = cx88_audio_initdev, .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 = { ...@@ -881,7 +881,7 @@ static struct pci_driver cx88_audio_pci_driver = {
/* /*
* module init * 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", printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n",
(CX88_VERSION_CODE >> 16) & 0xff, (CX88_VERSION_CODE >> 16) & 0xff,
...@@ -897,9 +897,8 @@ static int cx88_audio_init(void) ...@@ -897,9 +897,8 @@ static int cx88_audio_init(void)
/* /*
* module remove * module remove
*/ */
static void cx88_audio_fini(void) static void __exit cx88_audio_fini(void)
{ {
pci_unregister_driver(&cx88_audio_pci_driver); pci_unregister_driver(&cx88_audio_pci_driver);
} }
......
...@@ -1074,7 +1074,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = { ...@@ -1074,7 +1074,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = {
.set_bus_param = mx3_camera_set_bus_param, .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 mx3_camera_dev *mx3_cam;
struct resource *res; struct resource *res;
...@@ -1194,11 +1194,11 @@ static struct platform_driver mx3_camera_driver = { ...@@ -1194,11 +1194,11 @@ static struct platform_driver mx3_camera_driver = {
.name = MX3_CAM_DRV_NAME, .name = MX3_CAM_DRV_NAME,
}, },
.probe = mx3_camera_probe, .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); return platform_driver_register(&mx3_camera_driver);
} }
......
...@@ -1551,7 +1551,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { ...@@ -1551,7 +1551,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
.set_bus_param = pxa_camera_set_bus_param, .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 pxa_camera_dev *pcdev;
struct resource *res; struct resource *res;
...@@ -1726,11 +1726,11 @@ static struct platform_driver pxa_camera_driver = { ...@@ -1726,11 +1726,11 @@ static struct platform_driver pxa_camera_driver = {
.name = PXA_CAM_DRV_NAME, .name = PXA_CAM_DRV_NAME,
}, },
.probe = pxa_camera_probe, .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); return platform_driver_register(&pxa_camera_driver);
} }
......
...@@ -1205,7 +1205,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) ...@@ -1205,7 +1205,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
static struct platform_driver __refdata soc_camera_pdrv = { static struct platform_driver __refdata soc_camera_pdrv = {
.probe = soc_camera_pdrv_probe, .probe = soc_camera_pdrv_probe,
.remove = __exit_p(soc_camera_pdrv_remove), .remove = __devexit_p(soc_camera_pdrv_remove),
.driver = { .driver = {
.name = "soc-camera-pdrv", .name = "soc-camera-pdrv",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -1794,7 +1794,7 @@ static struct usb_driver usbvision_driver = { ...@@ -1794,7 +1794,7 @@ static struct usb_driver usbvision_driver = {
.name = "usbvision", .name = "usbvision",
.id_table = usbvision_table, .id_table = usbvision_table,
.probe = usbvision_probe, .probe = usbvision_probe,
.disconnect = usbvision_disconnect .disconnect = __devexit_p(usbvision_disconnect),
}; };
/* /*
......
...@@ -1477,7 +1477,7 @@ static struct pci_driver zoran_driver = { ...@@ -1477,7 +1477,7 @@ static struct pci_driver zoran_driver = {
.name = "zr36067", .name = "zr36067",
.id_table = zr36067_pci_tbl, .id_table = zr36067_pci_tbl,
.probe = zoran_probe, .probe = zoran_probe,
.remove = zoran_remove, .remove = __devexit_p(zoran_remove),
}; };
static int __init zoran_init(void) static int __init zoran_init(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册