media: nxp: use dev_err_probe() to simplify code

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>

authored by

Frank Li and committed by

Hans Verkuil 5 months ago 075282b2 5a50f2b6

+21 -32

3 changed files

expand all

drivers

media

platform

nxp

imx-mipi-csis.c

imx7-media-csi.c

imx8mq-mipi-csi2.c

+2 -4

drivers/media/platform/nxp/imx-mipi-csis.c

··· 1547 1547 /* Now that the hardware is initialized, request the interrupt. */ 1548 1548 ret = devm_request_irq(dev, irq, mipi_csis_irq_handler, 0, 1549 1549 dev_name(dev), csis); 1550 - if (ret) { 1551 - dev_err(dev, "Interrupt request failed\n"); 1552 - return ret; 1553 - } 1550 + if (ret) 1551 + return dev_err_probe(dev, ret, "Interrupt request failed\n"); 1554 1552 1555 1553 /* Initialize and register the subdev. */ 1556 1554 ret = mipi_csis_subdev_init(csis);

+5 -9

drivers/media/platform/nxp/imx7-media-csi.c

··· 2218 2218 2219 2219 /* Acquire resources and install interrupt handler. */ 2220 2220 csi->mclk = devm_clk_get(&pdev->dev, "mclk"); 2221 - if (IS_ERR(csi->mclk)) { 2222 - ret = PTR_ERR(csi->mclk); 2223 - dev_err(dev, "Failed to get mclk: %d", ret); 2224 - return ret; 2225 - } 2221 + if (IS_ERR(csi->mclk)) 2222 + return dev_err_probe(dev, PTR_ERR(csi->mclk), 2223 + "Failed to get mclk\n"); 2226 2224 2227 2225 csi->irq = platform_get_irq(pdev, 0); 2228 2226 if (csi->irq < 0) ··· 2234 2236 2235 2237 ret = devm_request_irq(dev, csi->irq, imx7_csi_irq_handler, 0, "csi", 2236 2238 (void *)csi); 2237 - if (ret < 0) { 2238 - dev_err(dev, "Request CSI IRQ failed.\n"); 2239 - return ret; 2240 - } 2239 + if (ret < 0) 2240 + return dev_err_probe(dev, ret, "Request CSI IRQ failed.\n"); 2241 2241 2242 2242 /* Initialize all the media device infrastructure. */ 2243 2243 ret = imx7_csi_media_init(csi);

+14 -19

drivers/media/platform/nxp/imx8mq-mipi-csi2.c

··· 951 951 int ret = 0; 952 952 953 953 state->rst = devm_reset_control_array_get_exclusive(dev); 954 - if (IS_ERR(state->rst)) { 955 - dev_err(dev, "Failed to get reset: %pe\n", state->rst); 956 - return PTR_ERR(state->rst); 957 - } 954 + if (IS_ERR(state->rst)) 955 + return dev_err_probe(dev, PTR_ERR(state->rst), 956 + "Failed to get reset\n"); 958 957 959 958 if (state->pdata->use_reg_csr) { 960 959 const struct regmap_config regmap_config = { ··· 976 977 977 978 ret = of_property_read_u32_array(np, "fsl,mipi-phy-gpr", out_val, 978 979 ARRAY_SIZE(out_val)); 979 - if (ret) { 980 - dev_err(dev, "no fsl,mipi-phy-gpr property found: %d\n", ret); 981 - return ret; 982 - } 980 + if (ret) 981 + return dev_err_probe(dev, ret, "property %s not found\n", 982 + "fsl,mipi-phy-gpr"); 983 983 984 984 ph = *out_val; 985 985 986 986 node = of_find_node_by_phandle(ph); 987 - if (!node) { 988 - dev_err(dev, "Error finding node by phandle\n"); 989 - return -ENODEV; 990 - } 987 + if (!node) 988 + return dev_err_probe(dev, -ENODEV, 989 + "Error finding node by phandle\n"); 990 + 991 991 state->phy_gpr = syscon_node_to_regmap(node); 992 992 of_node_put(node); 993 - if (IS_ERR(state->phy_gpr)) { 994 - dev_err(dev, "failed to get gpr regmap: %pe\n", state->phy_gpr); 995 - return PTR_ERR(state->phy_gpr); 996 - } 993 + if (IS_ERR(state->phy_gpr)) 994 + return dev_err_probe(dev, PTR_ERR(state->phy_gpr), 995 + "failed to get gpr regmap\n"); 997 996 998 997 state->phy_gpr_reg = out_val[1]; 999 998 dev_dbg(dev, "phy gpr register set to 0x%x\n", state->phy_gpr_reg); ··· 1014 1017 state->pdata = of_device_get_match_data(dev); 1015 1018 1016 1019 ret = imx8mq_mipi_csi_parse_dt(state); 1017 - if (ret < 0) { 1018 - dev_err(dev, "Failed to parse device tree: %d\n", ret); 1020 + if (ret < 0) 1019 1021 return ret; 1020 - } 1021 1022 1022 1023 /* Acquire resources. */ 1023 1024 state->regs = devm_platform_ioremap_resource(pdev, 0);

Configure Feed

Configure Feed