github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: nxp: use dev_err_probe() to simplify code

Browse Source 
Use dev_err_probe() to simplify the code. Drop the explicit error message
after returning from imx8mq_mipi_csi_parse_dt(), as the error is already
reported by this helper.

No functional change.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260116-cam_cleanup-v4-1-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:
Frank Li 2026-01-16 11:29:19 -05:00 committed by Hans Verkuil
parent 5a50f2b611
commit 075282b2e6
3 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/nxp/imx-mipi-csis.c
View File

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

14
drivers/media/platform/nxp/imx7-media-csi.c
View File

@ -2218,11 +2218,9 @@ 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");
csi->irq = platform_get_irq(pdev, 0);
if (csi->irq < 0)
@ -2236,10 +2234,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);

33
drivers/media/platform/nxp/imx8mq-mipi-csi2.c
View File

@ -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\n");
if (state->pdata->use_reg_csr) {
const struct regmap_config regmap_config = {
@ -977,24 +976,22 @@ 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, "property %s not found\n",
"fsl,mipi-phy-gpr");
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");
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\n");
state->phy_gpr_reg = out_val[1];
dev_dbg(dev, "phy gpr register set to 0x%x\n", state->phy_gpr_reg);
@ -1017,10 +1014,8 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev)
state->pdata = of_device_get_match_data(dev);
ret = imx8mq_mipi_csi_parse_dt(state);
if (ret < 0) {
dev_err(dev, "Failed to parse device tree: %d\n", ret);
if (ret < 0)
return ret;
}
/* Acquire resources. */
state->regs = devm_platform_ioremap_resource(pdev, 0);