tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Frank Li and committed by
Hans Verkuil 078161dd 075282b2

+7 -9
+7 -9
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
··· 499 499 dma_size = isi->pdata->has_36bit_dma ? 36 : 32; 500 500 dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_size)); 501 501 502 - pm_runtime_enable(dev); 502 + ret = devm_pm_runtime_enable(dev); 503 + if (ret) 504 + return ret; 503 505 504 506 ret = mxc_isi_crossbar_init(isi); 505 - if (ret) { 506 - dev_err(dev, "Failed to initialize crossbar: %d\n", ret); 507 - goto err_pm; 508 - } 507 + if (ret) 508 + return dev_err_probe(dev, ret, 509 + "Failed to initialize crossbar\n"); 509 510 510 511 for (i = 0; i < isi->pdata->num_channels; ++i) { 511 512 ret = mxc_isi_pipe_init(isi, i); ··· 529 528 530 529 err_xbar: 531 530 mxc_isi_crossbar_cleanup(&isi->crossbar); 532 - err_pm: 533 - pm_runtime_disable(isi->dev); 531 + 534 532 return ret; 535 533 } 536 534 ··· 548 548 549 549 mxc_isi_crossbar_cleanup(&isi->crossbar); 550 550 mxc_isi_v4l2_cleanup(isi); 551 - 552 - pm_runtime_disable(isi->dev); 553 551 } 554 552 555 553 static const struct of_device_id mxc_isi_of_match[] = {