Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f253f184 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] soc_camera_platform: Remove redundant platform_set_drvdata() 



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

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
[g.liakhovetski@gmx.de: further simplified return statement]
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 721110b3

drivers/media/platform/soc_camera/soc_camera_platform.c

+1 −11
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev) 
	struct soc_camera_platform_priv *priv;

	struct soc_camera_platform_info *p = pdev->dev.platform_data;

	struct soc_camera_device *icd;

	int ret;



	if (!p)

		return -EINVAL;
@@ -165,15 +164,7 @@ static int soc_camera_platform_probe(struct platform_device *pdev) 
	v4l2_set_subdevdata(&priv->subdev, p);

	strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);



	ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);

	if (ret)

		goto evdrs;



	return ret;



evdrs:

	platform_set_drvdata(pdev, NULL);

	return ret;

	return v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);

}



static int soc_camera_platform_remove(struct platform_device *pdev)
@@ -183,7 +174,6 @@ static int soc_camera_platform_remove(struct platform_device *pdev) 


	p->icd->control = NULL;

	v4l2_device_unregister_subdev(&priv->subdev);

	platform_set_drvdata(pdev, NULL);

	return 0;

}