Re: [PATCH 2/4] media: nxp: use dev_err_probe() to simplify code
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: 2025-11-19 04:33:45
Also in:
imx, linux-media, lkml
Hi Frank, Thank you for the patch. On Mon, Nov 17, 2025 at 01:58:12PM -0500, Frank Li wrote:
quoted hunk ↗ jump to hunk
Use dev_err_probe() to simplify code. No functional change. Signed-off-by: Frank Li <Frank.Li@nxp.com> --- drivers/media/platform/nxp/imx-mipi-csis.c | 6 ++---- drivers/media/platform/nxp/imx7-media-csi.c | 13 ++++--------- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 28 ++++++++++++--------------- 3 files changed, 18 insertions(+), 29 deletions(-)diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index 088b2945aee33731c565f049dd17721356300b84..ce93d868746f002c22e2f86b1e0aa84ec1a76061 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c@@ -1547,10 +1547,8 @@ static int mipi_csis_probe(struct platform_device *pdev) /* Now that the hardware is initialized, request the interrupt. */ ret = devm_request_irq(dev, irq, mipi_csis_irq_handler, 0, dev_name(dev), csis); - if (ret) { - dev_err(dev, "Interrupt request failed\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Interrupt request failed\n"); /* Initialize and register the subdev. */ ret = mipi_csis_subdev_init(csis);diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 933a5f39f9f4c9b43ca8d2a1819d0145981266e6..82109e6884a4d931a84ef02e2bde41d0d7248511 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c@@ -2218,11 +2218,8 @@ static int imx7_csi_probe(struct platform_device *pdev) /* Acquire resources and install interrupt handler. */ csi->mclk = devm_clk_get(&pdev->dev, "mclk"); - if (IS_ERR(csi->mclk)) { - ret = PTR_ERR(csi->mclk); - dev_err(dev, "Failed to get mclk: %d", ret); - return ret; - } + if (IS_ERR(csi->mclk)) + return dev_err_probe(dev, PTR_ERR(csi->mclk), "Failed to get mclk\n");
return dev_err_probe(dev, PTR_ERR(csi->mclk), "Failed to get mclk\n");
quoted hunk ↗ jump to hunk
csi->irq = platform_get_irq(pdev, 0); if (csi->irq < 0)@@ -2236,10 +2233,8 @@ static int imx7_csi_probe(struct platform_device *pdev) ret = devm_request_irq(dev, csi->irq, imx7_csi_irq_handler, 0, "csi", (void *)csi); - if (ret < 0) { - dev_err(dev, "Request CSI IRQ failed.\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Request CSI IRQ failed.\n"); /* Initialize all the media device infrastructure. */ ret = imx7_csi_media_init(csi);diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index 0851f4a9ae52d3096f454da643cfdc5017e000b1..75709161fb26a61239b94430365849e022fdc14f 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c@@ -951,10 +951,9 @@ static int imx8mq_mipi_csi_parse_dt(struct csi_state *state) int ret = 0; state->rst = devm_reset_control_array_get_exclusive(dev); - if (IS_ERR(state->rst)) { - dev_err(dev, "Failed to get reset: %pe\n", state->rst); - return PTR_ERR(state->rst); - } + if (IS_ERR(state->rst)) + return dev_err_probe(dev, PTR_ERR(state->rst), + "Failed to get reset: %pe\n", state->rst);
return dev_err_probe(dev, PTR_ERR(state->rst), "Failed to get reset\n"); as dev_err_probe() prints the error already.
quoted hunk ↗ jump to hunk
if (state->pdata->use_reg_csr) { const struct regmap_config regmap_config = {@@ -977,24 +976,21 @@ static int imx8mq_mipi_csi_parse_dt(struct csi_state *state) ret = of_property_read_u32_array(np, "fsl,mipi-phy-gpr", out_val, ARRAY_SIZE(out_val)); - if (ret) { - dev_err(dev, "no fsl,mipi-phy-gpr property found: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "no fsl,mipi-phy-gpr property found: %d\n", ret);
return dev_err_probe(dev, ret, "no fsl,mipi-phy-gpr property found\n"); or possibly return dev_err_probe(dev, ret, "no %s property found\n", "fsl,mipi-phy-gpr"); to enable string de-duplication (assuming it's worth it).
ph = *out_val;
node = of_find_node_by_phandle(ph);
- if (!node) {
- dev_err(dev, "Error finding node by phandle\n");
- return -ENODEV;
- }
+ if (!node)
+ return dev_err_probe(dev, -ENODEV, "Error finding node by phandle\n");Line wrap here too.
+
state->phy_gpr = syscon_node_to_regmap(node);
of_node_put(node);
- if (IS_ERR(state->phy_gpr)) {
- dev_err(dev, "failed to get gpr regmap: %pe\n", state->phy_gpr);
- return PTR_ERR(state->phy_gpr);
- }
+ if (IS_ERR(state->phy_gpr))
+ return dev_err_probe(dev, PTR_ERR(state->phy_gpr),
+ "failed to get gpr regmap: %pe\n", state->phy_gpr);return dev_err_probe(dev, PTR_ERR(state->phy_gpr), "failed to get gpr regmap\n"); I think you can also drop the error message upon imx8mq_mipi_csi_parse_dt() failure in imx8mq_mipi_csi_probe(). With those changes, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
state->phy_gpr_reg = out_val[1]; dev_dbg(dev, "phy gpr register set to 0x%x\n", state->phy_gpr_reg);
-- Regards, Laurent Pinchart