diff options
Diffstat (limited to 'drivers/media/platform/davinci/vpfe_capture.c')
-rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 8be492cd8ed4..be9d3e1b4868 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c | |||
@@ -1831,7 +1831,7 @@ static struct vpfe_device *vpfe_initialize(void) | |||
1831 | * itself to the V4L2 driver and initializes fields of each | 1831 | * itself to the V4L2 driver and initializes fields of each |
1832 | * device objects | 1832 | * device objects |
1833 | */ | 1833 | */ |
1834 | static __devinit int vpfe_probe(struct platform_device *pdev) | 1834 | static int vpfe_probe(struct platform_device *pdev) |
1835 | { | 1835 | { |
1836 | struct vpfe_subdev_info *sdinfo; | 1836 | struct vpfe_subdev_info *sdinfo; |
1837 | struct vpfe_config *vpfe_cfg; | 1837 | struct vpfe_config *vpfe_cfg; |
@@ -2038,7 +2038,7 @@ probe_free_dev_mem: | |||
2038 | /* | 2038 | /* |
2039 | * vpfe_remove : It un-register device from V4L2 driver | 2039 | * vpfe_remove : It un-register device from V4L2 driver |
2040 | */ | 2040 | */ |
2041 | static int __devexit vpfe_remove(struct platform_device *pdev) | 2041 | static int vpfe_remove(struct platform_device *pdev) |
2042 | { | 2042 | { |
2043 | struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev); | 2043 | struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev); |
2044 | 2044 | ||
@@ -2075,7 +2075,7 @@ static struct platform_driver vpfe_driver = { | |||
2075 | .pm = &vpfe_dev_pm_ops, | 2075 | .pm = &vpfe_dev_pm_ops, |
2076 | }, | 2076 | }, |
2077 | .probe = vpfe_probe, | 2077 | .probe = vpfe_probe, |
2078 | .remove = __devexit_p(vpfe_remove), | 2078 | .remove = vpfe_remove, |
2079 | }; | 2079 | }; |
2080 | 2080 | ||
2081 | module_platform_driver(vpfe_driver); | 2081 | module_platform_driver(vpfe_driver); |