On 13 May 2013 14:49, Sachin Kamat <sachin.kamat@xxxxxxxxxx> wrote: > 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@xxxxxxxxxx> > --- > drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 +------- > 1 file changed, 1 insertion(+), 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 09cb4fc..13a1f8f 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) > ret = v4l2_device_register_subdev(pdata->v4l2_dev, &priv->subdev); > dev_dbg(&pdev->dev, "%s(%p): ret(register_subdev) = %d\n", __func__, priv, ret); > if (ret < 0) > - goto esdreg; > + return ret; > > pm_runtime_enable(&pdev->dev); > > dev_dbg(&pdev->dev, "CSI2 probed.\n"); > > return 0; > - > -esdreg: > - platform_set_drvdata(pdev, NULL); > - > - return ret; > } > > 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); > pm_runtime_disable(&pdev->dev); > - platform_set_drvdata(pdev, NULL); > > return 0; > } > -- > 1.7.9.5 > Ping... -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
