iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Laurent Pinchart 2022-05-09 23:32:33 +01:00 committed by Mauro Carvalho Chehab
parent 084158200f
commit 0cc432b741
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/media/imx/imx7-media-csi.c
View File

@ -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 @@ destroy_mutex:
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);