Commit 86bd20a5 authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Daniel Lezcano

thermal-generic-adc: Silent error message for EPROBE_DEFER

If devm_iio_channel_get() or devm_thermal_zone_of_sensor_register()
fail with EPROBE_DEFER, we shouldn't print an error message, as the
device will be probed again later.
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20190910075907.132200-1-hsinyi@chromium.org
parent 554cee82
...@@ -134,6 +134,7 @@ static int gadc_thermal_probe(struct platform_device *pdev) ...@@ -134,6 +134,7 @@ static int gadc_thermal_probe(struct platform_device *pdev)
gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel"); gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel");
if (IS_ERR(gti->channel)) { if (IS_ERR(gti->channel)) {
ret = PTR_ERR(gti->channel); ret = PTR_ERR(gti->channel);
if (ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "IIO channel not found: %d\n", ret); dev_err(&pdev->dev, "IIO channel not found: %d\n", ret);
return ret; return ret;
} }
...@@ -142,7 +143,9 @@ static int gadc_thermal_probe(struct platform_device *pdev) ...@@ -142,7 +143,9 @@ static int gadc_thermal_probe(struct platform_device *pdev)
&gadc_thermal_ops); &gadc_thermal_ops);
if (IS_ERR(gti->tz_dev)) { if (IS_ERR(gti->tz_dev)) {
ret = PTR_ERR(gti->tz_dev); ret = PTR_ERR(gti->tz_dev);
dev_err(&pdev->dev, "Thermal zone sensor register failed: %d\n", if (ret != -EPROBE_DEFER)
dev_err(&pdev->dev,
"Thermal zone sensor register failed: %d\n",
ret); ret);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment