mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
media: nxp: imx8-isi: use devm_pm_runtime_enable() to simplify code
Use devm_pm_runtime_enable() to simplify code. Change to use dev_err_probe() because previous goto change to return. No functional change. Signed-off-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patch.msgid.link/20260116-cam_cleanup-v4-2-29ce01640443@nxp.com Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
075282b2e6
commit
078161dd44
|
|
@ -499,13 +499,14 @@ static int mxc_isi_probe(struct platform_device *pdev)
|
|||
dma_size = isi->pdata->has_36bit_dma ? 36 : 32;
|
||||
dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_size));
|
||||
|
||||
pm_runtime_enable(dev);
|
||||
ret = devm_pm_runtime_enable(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = mxc_isi_crossbar_init(isi);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to initialize crossbar: %d\n", ret);
|
||||
goto err_pm;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret,
|
||||
"Failed to initialize crossbar\n");
|
||||
|
||||
for (i = 0; i < isi->pdata->num_channels; ++i) {
|
||||
ret = mxc_isi_pipe_init(isi, i);
|
||||
|
|
@ -528,8 +529,7 @@ static int mxc_isi_probe(struct platform_device *pdev)
|
|||
|
||||
err_xbar:
|
||||
mxc_isi_crossbar_cleanup(&isi->crossbar);
|
||||
err_pm:
|
||||
pm_runtime_disable(isi->dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -548,8 +548,6 @@ static void mxc_isi_remove(struct platform_device *pdev)
|
|||
|
||||
mxc_isi_crossbar_cleanup(&isi->crossbar);
|
||||
mxc_isi_v4l2_cleanup(isi);
|
||||
|
||||
pm_runtime_disable(isi->dev);
|
||||
}
|
||||
|
||||
static const struct of_device_id mxc_isi_of_match[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user