]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
thermal/drivers/imx8mm: Suppress log message on probe deferral
authorAhmad Fatoum <a.fatoum@pengutronix.de>
Sat, 8 Jul 2023 11:26:46 +0000 (13:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Sep 2023 07:48:35 +0000 (09:48 +0200)
[ Upstream commit 4afcb58ea47e66c025d2b0a5f091dce5aaf95b0f ]

nvmem_cell_read_u32() may return -EPROBE_DEFER if NVMEM supplier has not
yet been probed. Future reprobe may succeed, so printing:

  i.mx8mm_thermal 30260000.tmu: Failed to read OCOTP nvmem cell (-517).

to the log is confusing. Fix this by using dev_err_probe. This also
elevates the message from warning to error, which is more correct: The
log message is only ever printed in probe error path and probe aborts
afterwards, so it really warrants an error-level message.

Fixes: 403291648823 ("thermal/drivers/imx: Add support for loading calibration data from OCOTP")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230708112647.2897294-1-a.fatoum@pengutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/thermal/imx8mm_thermal.c

index d8005e9ec992bd96154144331a801922fc71016e..1f780c4a1c890c6b3088bfa5a3acc67e9ed6615c 100644 (file)
@@ -179,10 +179,8 @@ static int imx8mm_tmu_probe_set_calib_v1(struct platform_device *pdev,
        int ret;
 
        ret = nvmem_cell_read_u32(&pdev->dev, "calib", &ana0);
-       if (ret) {
-               dev_warn(dev, "Failed to read OCOTP nvmem cell (%d).\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to read OCOTP nvmem cell\n");
 
        writel(FIELD_PREP(TASR_BUF_VREF_MASK,
                          FIELD_GET(ANA0_BUF_VREF_MASK, ana0)) |