aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/meye
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:17:53 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:02 -0500
commit4c62e9764ab403d42f9b8871b1241fe7812f19d4 (patch)
treeb4ae1ce3993ebf1d64660ba16362f9ef3de73074 /drivers/media/pci/meye
parentc571b211a70bcb04249be5cb7338f95d2ec8100f (diff)
Drivers: media: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/pci/meye')
-rw-r--r--drivers/media/pci/meye/meye.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index ae7d32027bf7..049e18667cd0 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1728,8 +1728,7 @@ static int meye_resume(struct pci_dev *pdev)
1728} 1728}
1729#endif 1729#endif
1730 1730
1731static int __devinit meye_probe(struct pci_dev *pcidev, 1731static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
1732 const struct pci_device_id *ent)
1733{ 1732{
1734 struct v4l2_device *v4l2_dev = &meye.v4l2_dev; 1733 struct v4l2_device *v4l2_dev = &meye.v4l2_dev;
1735 int ret = -EBUSY; 1734 int ret = -EBUSY;
@@ -1889,7 +1888,7 @@ outnotdev:
1889 return ret; 1888 return ret;
1890} 1889}
1891 1890
1892static void __devexit meye_remove(struct pci_dev *pcidev) 1891static void meye_remove(struct pci_dev *pcidev)
1893{ 1892{
1894 video_unregister_device(meye.vdev); 1893 video_unregister_device(meye.vdev);
1895 1894
@@ -1935,7 +1934,7 @@ static struct pci_driver meye_driver = {
1935 .name = "meye", 1934 .name = "meye",
1936 .id_table = meye_pci_tbl, 1935 .id_table = meye_pci_tbl,
1937 .probe = meye_probe, 1936 .probe = meye_probe,
1938 .remove = __devexit_p(meye_remove), 1937 .remove = meye_remove,
1939#ifdef CONFIG_PM 1938#ifdef CONFIG_PM
1940 .suspend = meye_suspend, 1939 .suspend = meye_suspend,
1941 .resume = meye_resume, 1940 .resume = meye_resume,