queue-4.19/drivers-thermal-tsens-don-t-print-error-message-on-e.patch

   1 From 04c4c507a14999e1dba78cefe7255ea10e80e036 Mon Sep 17 00:00:00 2001
   2 From: Amit Kucheria <amit.kucheria@linaro.org>
   3 Date: Wed, 20 Mar 2019 18:47:52 +0530
   4 Subject: drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER
   5
   6 [ Upstream commit fc7d18cf6a923cde7f5e7ba2c1105bb106d3e29a ]
   7
   8 We print a calibration failure message on -EPROBE_DEFER from
   9 nvmem/qfprom as follows:
  10 [    3.003090] qcom-tsens 4a9000.thermal-sensor: version: 1.4
  11 [    3.005376] qcom-tsens 4a9000.thermal-sensor: tsens calibration failed
  12 [    3.113248] qcom-tsens 4a9000.thermal-sensor: version: 1.4
  13
  14 This confuses people when, in fact, calibration succeeds later when
  15 nvmem/qfprom device is available. Don't print this message on a
  16 -EPROBE_DEFER.
  17
  18 Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
  19 Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
  20 Signed-off-by: Sasha Levin <sashal@kernel.org>
  21 ---
  22  drivers/thermal/qcom/tsens.c | 3 ++-
  23  1 file changed, 2 insertions(+), 1 deletion(-)
  24
  25 diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
  26 index a2c9bfae3d86..b139713289a4 100644
  27 --- a/drivers/thermal/qcom/tsens.c
  28 +++ b/drivers/thermal/qcom/tsens.c
  29 @@ -171,7 +171,8 @@ static int tsens_probe(struct platform_device *pdev)
  30         if (tmdev->ops->calibrate) {
  31                 ret = tmdev->ops->calibrate(tmdev);
  32                 if (ret < 0) {
  33 -                       dev_err(dev, "tsens calibration failed\n");
  34 +                       if (ret != -EPROBE_DEFER)
  35 +                               dev_err(dev, "tsens calibration failed\n");
  36                         return ret;
  37                 }
  38         }
  39 --
  40 2.20.1
  41