aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/fsl-viu.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/fsl-viu.c')
-rw-r--r--drivers/media/platform/fsl-viu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index a8ddb0cacab..9115a2c8d07 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1478,7 +1478,7 @@ static struct video_device viu_template = {
1478 .current_norm = V4L2_STD_NTSC_M, 1478 .current_norm = V4L2_STD_NTSC_M,
1479}; 1479};
1480 1480
1481static int __devinit viu_of_probe(struct platform_device *op) 1481static int viu_of_probe(struct platform_device *op)
1482{ 1482{
1483 struct viu_dev *viu_dev; 1483 struct viu_dev *viu_dev;
1484 struct video_device *vdev; 1484 struct video_device *vdev;
@@ -1615,7 +1615,7 @@ err:
1615 return ret; 1615 return ret;
1616} 1616}
1617 1617
1618static int __devexit viu_of_remove(struct platform_device *op) 1618static int viu_of_remove(struct platform_device *op)
1619{ 1619{
1620 struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev); 1620 struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev);
1621 struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev); 1621 struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev);
@@ -1668,7 +1668,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_viu_of_match);
1668 1668
1669static struct platform_driver viu_of_platform_driver = { 1669static struct platform_driver viu_of_platform_driver = {
1670 .probe = viu_of_probe, 1670 .probe = viu_of_probe,
1671 .remove = __devexit_p(viu_of_remove), 1671 .remove = viu_of_remove,
1672#ifdef CONFIG_PM 1672#ifdef CONFIG_PM
1673 .suspend = viu_suspend, 1673 .suspend = viu_suspend,
1674 .resume = viu_resume, 1674 .resume = viu_resume,