leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] soc_camera/sh_mobile_csi2: Remove redundant platform_set_drvdata()

Browse Source 
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat 2013-05-13 06:19:20 -03:00 committed by Mauro Carvalho Chehab
parent 8b0706802f
commit 721110b34c
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/soc_camera/sh_mobile_csi2.c
View File

@ -340,18 +340,13 @@ static int sh_csi2_probe(struct platform_device *pdev)
ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev); ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev);
dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret); dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret);
if (ret < 0) if (ret < 0)
goto esdreg; return ret;
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
dev_dbg(&pdev->dev, "CSI2 probed.\n"); dev_dbg(&pdev->dev, "CSI2 probed.\n");
return 0; return 0;
esdreg:
platform_set_drvdata(pdev, NULL);
return ret;
} }
static int sh_csi2_remove(struct platform_device *pdev) static int sh_csi2_remove(struct platform_device *pdev)
@ -360,7 +355,6 @@ static int sh_csi2_remove(struct platform_device *pdev)
v4l2_device_unregister_subdev(&priv->subdev); v4l2_device_unregister_subdev(&priv->subdev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }