diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-05-13 05:19:20 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 12:10:45 -0400 |
commit | 721110b34cd9fe411182398850aeb5f6cb204935 (patch) | |
tree | 7e6a052fc734ed964ad97a78a868cd4f7ff3a106 /drivers/media/platform/soc_camera | |
parent | 8b0706802fede74a2ee0341499f0b4586118a7d3 (diff) |
[media] soc_camera/sh_mobile_csi2: Remove redundant platform_set_drvdata()
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>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r-- | drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c index 09cb4fc88f34..13a1f8f13f65 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c | |||
@@ -340,18 +340,13 @@ static int sh_csi2_probe(struct platform_device *pdev) | |||
340 | ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev); | 340 | ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev); |
341 | dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret); | 341 | dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret); |
342 | if (ret < 0) | 342 | if (ret < 0) |
343 | goto esdreg; | 343 | return ret; |
344 | 344 | ||
345 | pm_runtime_enable(&pdev->dev); | 345 | pm_runtime_enable(&pdev->dev); |
346 | 346 | ||
347 | dev_dbg(&pdev->dev, "CSI2 probed.\n"); | 347 | dev_dbg(&pdev->dev, "CSI2 probed.\n"); |
348 | 348 | ||
349 | return 0; | 349 | return 0; |
350 | |||
351 | esdreg: | ||
352 | platform_set_drvdata(pdev, NULL); | ||
353 | |||
354 | return ret; | ||
355 | } | 350 | } |
356 | 351 | ||
357 | static int sh_csi2_remove(struct platform_device *pdev) | 352 | static int sh_csi2_remove(struct platform_device *pdev) |
@@ -360,7 +355,6 @@ static int sh_csi2_remove(struct platform_device *pdev) | |||
360 | 355 | ||
361 | v4l2_device_unregister_subdev(&priv->subdev); | 356 | v4l2_device_unregister_subdev(&priv->subdev); |
362 | pm_runtime_disable(&pdev->dev); | 357 | pm_runtime_disable(&pdev->dev); |
363 | platform_set_drvdata(pdev, NULL); | ||
364 | 358 | ||
365 | return 0; | 359 | return 0; |
366 | } | 360 | } |