thermal: qoriq: Don't store struct thermal_zone_device reference

Struct thermal_zone_device reference stored as sensor's private data
isn't really used anywhere in the code. Drop it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Lucas Stach <l.stach@pengutronix.de>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Angus Ainslie (Purism) <angus@akkea.ca>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20191210164153.10463-3-andrew.smirnov@gmail.com

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index dd47b31..2f2f5ff 100644 (file)
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -110,7 +110,6 @@ struct qoriq_tmu_data;
  * Thermal zone data
  */
 struct qoriq_sensor {
-       struct thermal_zone_device      *tzd;
        struct qoriq_tmu_data           *qdata;
        int                             id;
 };
@@ -162,6 +161,9 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)
        int id, sites = 0;
 
        for (id = 0; id < SITES_MAX; id++) {
+               struct thermal_zone_device *tzd;
+               int ret;
+
                qdata->sensor[id] = devm_kzalloc(&pdev->dev,
                                sizeof(struct qoriq_sensor), GFP_KERNEL);
                if (!qdata->sensor[id])
@@ -169,13 +171,16 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)
 
                qdata->sensor[id]->id = id;
                qdata->sensor[id]->qdata = qdata;
-               qdata->sensor[id]->tzd = devm_thermal_zone_of_sensor_register(
-                               &pdev->dev, id, qdata->sensor[id], &tmu_tz_ops);
-               if (IS_ERR(qdata->sensor[id]->tzd)) {
-                       if (PTR_ERR(qdata->sensor[id]->tzd) == -ENODEV)
+
+               tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
+                                                          qdata->sensor[id],
+                                                          &tmu_tz_ops);
+               ret = PTR_ERR_OR_ZERO(tzd);
+               if (ret) {
+                       if (ret == -ENODEV)
                                continue;
                        else
-                               return PTR_ERR(qdata->sensor[id]->tzd);
+                               return ret;
                }
 
                if (qdata->ver == TMU_VER1)