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

media: pxa_camera: Register V4L2 device early

Browse Source 
Register V4L2 device before initialising the notifier. This way the device
can be made available to the V4L2 async framework from the notifier init
time onwards. A subsequent patch will add struct v4l2_device as an
argument to v4l2_async_nf_init().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de> # imx6qp
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> # rcar + adv746x
Tested-by: Aishwarya Kothari <aishwarya.kothari@toradex.com> # Apalis i.MX6Q with TC358743
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> # Renesas RZ/G2L SMARC
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Sakari Ailus 2023-03-29 14:54:05 +02:00 committed by Mauro Carvalho Chehab
parent 6e1e132e00
commit 5073d10cba
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/platform/intel/pxa_camera.c
View File

@ -2298,6 +2298,10 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->irq = irq; pcdev->irq = irq;
pcdev->base = base; pcdev->base = base;
err = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev);
if (err)
return err;
v4l2_async_nf_init(&pcdev->notifier); v4l2_async_nf_init(&pcdev->notifier);
pcdev->res = res; pcdev->res = res;
pcdev->pdata = pdev->dev.platform_data; pcdev->pdata = pdev->dev.platform_data;
@ -2315,10 +2319,10 @@ static int pxa_camera_probe(struct platform_device *pdev)
} else if (pdev->dev.of_node) { } else if (pdev->dev.of_node) {
err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev); err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev);
} else { } else {
return -ENODEV; err = -ENODEV;
} }
if (err < 0) if (err < 0)
return err; goto exit_v4l2_device_unregister;
if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 | if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |
PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) { PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {
@ -2384,13 +2388,10 @@ static int pxa_camera_probe(struct platform_device *pdev)
pxa_camera_activate(pcdev); pxa_camera_activate(pcdev);
platform_set_drvdata(pdev, pcdev); platform_set_drvdata(pdev, pcdev);
err = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev);
if (err)
goto exit_deactivate;
err = pxa_camera_init_videobuf2(pcdev); err = pxa_camera_init_videobuf2(pcdev);
if (err) if (err)
goto exit_v4l2_device_unregister; goto exit_deactivate;
/* request irq */ /* request irq */
err = devm_request_irq(&pdev->dev, pcdev->irq, pxa_camera_irq, 0, err = devm_request_irq(&pdev->dev, pcdev->irq, pxa_camera_irq, 0,
@ -2403,11 +2404,9 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->notifier.ops = &pxa_camera_sensor_ops; pcdev->notifier.ops = &pxa_camera_sensor_ops;
err = v4l2_async_nf_register(&pcdev->v4l2_dev, &pcdev->notifier); err = v4l2_async_nf_register(&pcdev->v4l2_dev, &pcdev->notifier);
if (err) if (err)
goto exit_v4l2_device_unregister; goto exit_deactivate;
return 0; return 0;
exit_v4l2_device_unregister:
v4l2_device_unregister(&pcdev->v4l2_dev);
exit_deactivate: exit_deactivate:
pxa_camera_deactivate(pcdev); pxa_camera_deactivate(pcdev);
tasklet_kill(&pcdev->task_eof); tasklet_kill(&pcdev->task_eof);
@ -2419,6 +2418,8 @@ exit_free_dma_y:
dma_release_channel(pcdev->dma_chans[0]); dma_release_channel(pcdev->dma_chans[0]);
exit_notifier_cleanup: exit_notifier_cleanup:
v4l2_async_nf_cleanup(&pcdev->notifier); v4l2_async_nf_cleanup(&pcdev->notifier);
exit_v4l2_device_unregister:
v4l2_device_unregister(&pcdev->v4l2_dev);
return err; return err;
} }