diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-06-04 10:07:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:07:51 -0400 |
commit | e36bc31f823d6089bedc935fea82b6d36793412a (patch) | |
tree | a5c2b21ba314507ec61b00ded3ce6607c8094c86 /drivers | |
parent | 96ceea2734d922d07000e98606231f3d675e09f8 (diff) |
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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/bt8xx/bt878.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 7 | ||||
-rw-r--r-- | drivers/media/video/mx3_camera.c | 6 | ||||
-rw-r--r-- | drivers/media/video/pxa_camera.c | 6 | ||||
-rw-r--r-- | drivers/media/video/soc_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zoran_card.c | 2 |
7 files changed, 13 insertions, 20 deletions
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index 56d8fab688bb..a24c125331f0 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
@@ -508,12 +508,6 @@ static int __devinit bt878_probe(struct pci_dev *dev, | |||
508 | pci_set_master(dev); | 508 | pci_set_master(dev); |
509 | pci_set_drvdata(dev, bt); | 509 | pci_set_drvdata(dev, bt); |
510 | 510 | ||
511 | /* if(init_bt878(btv) < 0) { | ||
512 | bt878_remove(dev); | ||
513 | return -EIO; | ||
514 | } | ||
515 | */ | ||
516 | |||
517 | if ((result = bt878_mem_alloc(bt))) { | 511 | if ((result = bt878_mem_alloc(bt))) { |
518 | printk(KERN_ERR "bt878: failed to allocate memory!\n"); | 512 | printk(KERN_ERR "bt878: failed to allocate memory!\n"); |
519 | goto fail2; | 513 | goto fail2; |
@@ -579,7 +573,7 @@ static struct pci_driver bt878_pci_driver = { | |||
579 | .name = "bt878", | 573 | .name = "bt878", |
580 | .id_table = bt878_pci_tbl, | 574 | .id_table = bt878_pci_tbl, |
581 | .probe = bt878_probe, | 575 | .probe = bt878_probe, |
582 | .remove = bt878_remove, | 576 | .remove = __devexit_p(bt878_remove), |
583 | }; | 577 | }; |
584 | 578 | ||
585 | static int bt878_pci_driver_registered; | 579 | static int bt878_pci_driver_registered; |
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 0ccdf36626e3..5a67445dd6ed 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -871,7 +871,7 @@ static struct pci_driver cx88_audio_pci_driver = { | |||
871 | .name = "cx88_audio", | 871 | .name = "cx88_audio", |
872 | .id_table = cx88_audio_pci_tbl, | 872 | .id_table = cx88_audio_pci_tbl, |
873 | .probe = cx88_audio_initdev, | 873 | .probe = cx88_audio_initdev, |
874 | .remove = cx88_audio_finidev, | 874 | .remove = __devexit_p(cx88_audio_finidev), |
875 | }; | 875 | }; |
876 | 876 | ||
877 | /**************************************************************************** | 877 | /**************************************************************************** |
@@ -881,7 +881,7 @@ static struct pci_driver cx88_audio_pci_driver = { | |||
881 | /* | 881 | /* |
882 | * module init | 882 | * module init |
883 | */ | 883 | */ |
884 | static int cx88_audio_init(void) | 884 | static int __init cx88_audio_init(void) |
885 | { | 885 | { |
886 | printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n", | 886 | printk(KERN_INFO "cx2388x alsa driver version %d.%d.%d loaded\n", |
887 | (CX88_VERSION_CODE >> 16) & 0xff, | 887 | (CX88_VERSION_CODE >> 16) & 0xff, |
@@ -897,9 +897,8 @@ static int cx88_audio_init(void) | |||
897 | /* | 897 | /* |
898 | * module remove | 898 | * module remove |
899 | */ | 899 | */ |
900 | static void cx88_audio_fini(void) | 900 | static void __exit cx88_audio_fini(void) |
901 | { | 901 | { |
902 | |||
903 | pci_unregister_driver(&cx88_audio_pci_driver); | 902 | pci_unregister_driver(&cx88_audio_pci_driver); |
904 | } | 903 | } |
905 | 904 | ||
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 4d47eeb14452..e605c076ed89 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -1074,7 +1074,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = { | |||
1074 | .set_bus_param = mx3_camera_set_bus_param, | 1074 | .set_bus_param = mx3_camera_set_bus_param, |
1075 | }; | 1075 | }; |
1076 | 1076 | ||
1077 | static int mx3_camera_probe(struct platform_device *pdev) | 1077 | static int __devinit mx3_camera_probe(struct platform_device *pdev) |
1078 | { | 1078 | { |
1079 | struct mx3_camera_dev *mx3_cam; | 1079 | struct mx3_camera_dev *mx3_cam; |
1080 | struct resource *res; | 1080 | struct resource *res; |
@@ -1194,11 +1194,11 @@ static struct platform_driver mx3_camera_driver = { | |||
1194 | .name = MX3_CAM_DRV_NAME, | 1194 | .name = MX3_CAM_DRV_NAME, |
1195 | }, | 1195 | }, |
1196 | .probe = mx3_camera_probe, | 1196 | .probe = mx3_camera_probe, |
1197 | .remove = __exit_p(mx3_camera_remove), | 1197 | .remove = __devexit_p(mx3_camera_remove), |
1198 | }; | 1198 | }; |
1199 | 1199 | ||
1200 | 1200 | ||
1201 | static int __devinit mx3_camera_init(void) | 1201 | static int __init mx3_camera_init(void) |
1202 | { | 1202 | { |
1203 | return platform_driver_register(&mx3_camera_driver); | 1203 | return platform_driver_register(&mx3_camera_driver); |
1204 | } | 1204 | } |
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 2da5eef19b70..f60de40fd21f 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -1551,7 +1551,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { | |||
1551 | .set_bus_param = pxa_camera_set_bus_param, | 1551 | .set_bus_param = pxa_camera_set_bus_param, |
1552 | }; | 1552 | }; |
1553 | 1553 | ||
1554 | static int pxa_camera_probe(struct platform_device *pdev) | 1554 | static int __devinit pxa_camera_probe(struct platform_device *pdev) |
1555 | { | 1555 | { |
1556 | struct pxa_camera_dev *pcdev; | 1556 | struct pxa_camera_dev *pcdev; |
1557 | struct resource *res; | 1557 | struct resource *res; |
@@ -1726,11 +1726,11 @@ static struct platform_driver pxa_camera_driver = { | |||
1726 | .name = PXA_CAM_DRV_NAME, | 1726 | .name = PXA_CAM_DRV_NAME, |
1727 | }, | 1727 | }, |
1728 | .probe = pxa_camera_probe, | 1728 | .probe = pxa_camera_probe, |
1729 | .remove = __exit_p(pxa_camera_remove), | 1729 | .remove = __devexit_p(pxa_camera_remove), |
1730 | }; | 1730 | }; |
1731 | 1731 | ||
1732 | 1732 | ||
1733 | static int __devinit pxa_camera_init(void) | 1733 | static int __init pxa_camera_init(void) |
1734 | { | 1734 | { |
1735 | return platform_driver_register(&pxa_camera_driver); | 1735 | return platform_driver_register(&pxa_camera_driver); |
1736 | } | 1736 | } |
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 2014e9e32b35..16f595d4337a 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -1205,7 +1205,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) | |||
1205 | 1205 | ||
1206 | static struct platform_driver __refdata soc_camera_pdrv = { | 1206 | static struct platform_driver __refdata soc_camera_pdrv = { |
1207 | .probe = soc_camera_pdrv_probe, | 1207 | .probe = soc_camera_pdrv_probe, |
1208 | .remove = __exit_p(soc_camera_pdrv_remove), | 1208 | .remove = __devexit_p(soc_camera_pdrv_remove), |
1209 | .driver = { | 1209 | .driver = { |
1210 | .name = "soc-camera-pdrv", | 1210 | .name = "soc-camera-pdrv", |
1211 | .owner = THIS_MODULE, | 1211 | .owner = THIS_MODULE, |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index d03e5922d3b8..90b58914f984 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -1794,7 +1794,7 @@ static struct usb_driver usbvision_driver = { | |||
1794 | .name = "usbvision", | 1794 | .name = "usbvision", |
1795 | .id_table = usbvision_table, | 1795 | .id_table = usbvision_table, |
1796 | .probe = usbvision_probe, | 1796 | .probe = usbvision_probe, |
1797 | .disconnect = usbvision_disconnect | 1797 | .disconnect = __devexit_p(usbvision_disconnect), |
1798 | }; | 1798 | }; |
1799 | 1799 | ||
1800 | /* | 1800 | /* |
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c index ea9de8b47db3..03dc2f3cf84a 100644 --- a/drivers/media/video/zoran/zoran_card.c +++ b/drivers/media/video/zoran/zoran_card.c | |||
@@ -1477,7 +1477,7 @@ static struct pci_driver zoran_driver = { | |||
1477 | .name = "zr36067", | 1477 | .name = "zr36067", |
1478 | .id_table = zr36067_pci_tbl, | 1478 | .id_table = zr36067_pci_tbl, |
1479 | .probe = zoran_probe, | 1479 | .probe = zoran_probe, |
1480 | .remove = zoran_remove, | 1480 | .remove = __devexit_p(zoran_remove), |
1481 | }; | 1481 | }; |
1482 | 1482 | ||
1483 | static int __init zoran_init(void) | 1483 | static int __init zoran_init(void) |