thermal: generic-adc: silence "no lookup table" on deferred probe
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Tue, 7 Jan 2020 23:20:43 +0000 (00:20 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Mon, 27 Jan 2020 09:24:32 +0000 (10:24 +0100)
A "generic-adc-thermal" without "temperature-lookup-table" is perfectly
valid since commit d36e2fa0253875 ("thermal: generic-adc: make lookup
table optional"). On deferred probe the message "no lookup table,
assuming DAC channel returns milliCelcius" is still logged.
Prevent this message on deferred probe of the IIO channel by first
looking up the IIO channel.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200107232044.889075-2-martin.blumenstingl@googlemail.com
drivers/thermal/thermal-generic-adc.c

index ae5743c9a894f400c33c98e50b422746ea6c54ed..226e3c2b746950804832cb42a36e9394d878f349 100644 (file)
@@ -124,13 +124,6 @@ static int gadc_thermal_probe(struct platform_device *pdev)
        if (!gti)
                return -ENOMEM;
 
-       ret = gadc_thermal_read_linear_lookup_table(&pdev->dev, gti);
-       if (ret < 0)
-               return ret;
-
-       gti->dev = &pdev->dev;
-       platform_set_drvdata(pdev, gti);
-
        gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel");
        if (IS_ERR(gti->channel)) {
                ret = PTR_ERR(gti->channel);
@@ -139,6 +132,13 @@ static int gadc_thermal_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = gadc_thermal_read_linear_lookup_table(&pdev->dev, gti);
+       if (ret < 0)
+               return ret;
+
+       gti->dev = &pdev->dev;
+       platform_set_drvdata(pdev, gti);
+
        gti->tz_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, gti,
                                                           &gadc_thermal_ops);
        if (IS_ERR(gti->tz_dev)) {