Message ID | 20190910075907.132200-1-hsinyi@chromium.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | 86bd20a5a518c0690bfca2cc64bc28af0e46863e |
Headers | show |
Series | thermal-generic-adc: Silent error message for EPROBE_DEFER | expand |
On Tue, Sep 10, 2019 at 12:59 AM Hsin-Yi Wang <hsinyi@chromium.org> wrote: > > 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: Hsin-Yi Wang <hsinyi@chromium.org> > --- Ping on the thread. Any suggestion for this patch? Thanks
On Mon, 7 Oct 2019 10:07:22 -0700 Hsin-Yi Wang <hsinyi@chromium.org> wrote: > On Tue, Sep 10, 2019 at 12:59 AM Hsin-Yi Wang <hsinyi@chromium.org> wrote: > > > > 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: Hsin-Yi Wang <hsinyi@chromium.org> > > --- > > Ping on the thread. Any suggestion for this patch? > Thanks Looks sensible to me. Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 08/10/2019 13:45, Jonathan Cameron wrote: > On Mon, 7 Oct 2019 10:07:22 -0700 > Hsin-Yi Wang <hsinyi@chromium.org> wrote: > >> On Tue, Sep 10, 2019 at 12:59 AM Hsin-Yi Wang <hsinyi@chromium.org> wrote: >>> >>> 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: Hsin-Yi Wang <hsinyi@chromium.org> >>> --- >> >> Ping on the thread. Any suggestion for this patch? >> Thanks > > Looks sensible to me. > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> I've applied this patch on the testing branch. Thanks!
diff --git a/drivers/thermal/thermal-generic-adc.c b/drivers/thermal/thermal-generic-adc.c index dcecf2e8dc8e..ae5743c9a894 100644 --- a/drivers/thermal/thermal-generic-adc.c +++ b/drivers/thermal/thermal-generic-adc.c @@ -134,7 +134,8 @@ static int gadc_thermal_probe(struct platform_device *pdev) gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel"); if (IS_ERR(gti->channel)) { ret = PTR_ERR(gti->channel); - dev_err(&pdev->dev, "IIO channel not found: %d\n", ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "IIO channel not found: %d\n", ret); return ret; } @@ -142,8 +143,10 @@ static int gadc_thermal_probe(struct platform_device *pdev) &gadc_thermal_ops); if (IS_ERR(gti->tz_dev)) { ret = PTR_ERR(gti->tz_dev); - dev_err(&pdev->dev, "Thermal zone sensor register failed: %d\n", - ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "Thermal zone sensor register failed: %d\n", + ret); return ret; }
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: Hsin-Yi Wang <hsinyi@chromium.org> --- drivers/thermal/thermal-generic-adc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)