Commit 0cc432b7 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: imx: imx7-media-csi: Store imx7_csi in drv data 



Replace the subdev pointer stored in platform drv data with the imx7_csi
pointer. Drop a now redundant dev_set_drvdata() call.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Tested-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 08415820

drivers/staging/media/imx/imx7-media-csi.c

+3 −6
Original line number Diff line number Diff line
@@ -1842,8 +1842,6 @@ static int imx7_csi_media_dev_init(struct imx7_csi *csi) 
{

	int ret;



	dev_set_drvdata(csi->dev, csi);



	strscpy(csi->mdev.model, "imx-media", sizeof(csi->mdev.model));

	csi->mdev.ops = &imx7_csi_media_ops;

	csi->mdev.dev = csi->dev;
@@ -1922,7 +1920,7 @@ static int imx7_csi_probe(struct platform_device *pdev) 
		return -ENOMEM;



	csi->dev = dev;

	platform_set_drvdata(pdev, &csi->sd);

	platform_set_drvdata(pdev, csi);



	spin_lock_init(&csi->irqlock);

	mutex_init(&csi->lock);
@@ -1986,14 +1984,13 @@ static int imx7_csi_probe(struct platform_device *pdev) 


static int imx7_csi_remove(struct platform_device *pdev)

{

	struct v4l2_subdev *sd = platform_get_drvdata(pdev);

	struct imx7_csi *csi = v4l2_get_subdevdata(sd);

	struct imx7_csi *csi = platform_get_drvdata(pdev);



	imx7_csi_media_cleanup(csi);



	v4l2_async_nf_unregister(&csi->notifier);

	v4l2_async_nf_cleanup(&csi->notifier);

	v4l2_async_unregister_subdev(sd);

	v4l2_async_unregister_subdev(&csi->sd);



	mutex_destroy(&csi->lock);