thermal/of: Remove the device node pointer for thermal_trip

The device node pointer is no longer needed in the thermal trip
structure, remove it.

Cc: Alexandre Bailon <abailon@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://lore.kernel.org/r/20220722200007.1839356-4-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 726e327b4205fae4763c5841f57da2a0ffab9232..ff10cdda056c3fe694207fd9b931e9085679b3f6 100644 (file)
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -70,13 +70,11 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev);
 
 /**
  * struct thermal_trip - representation of a point in temperature domain
- * @np: pointer to struct device_node that this trip point was created from
  * @temperature: temperature value in miliCelsius
  * @hysteresis: relative hysteresis in miliCelsius
  * @type: trip point type
  */
 struct thermal_trip {
-       struct device_node *np;
        int temperature;
        int hysteresis;
        enum thermal_trip_type type;

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 9295bc59998f7ca42389193742c55ef687d24e36..0d04474ed951cf15061cc4e2fb221d2f25ab2001 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -867,10 +867,6 @@ static int thermal_of_populate_trip(struct device_node *np,
                return ret;
        }
 
-       /* Required for cooling map matching */
-       trip->np = np;
-       of_node_get(np);
-
        return 0;
 }
 
@@ -1001,8 +997,6 @@ free_tbps:
 
        kfree(tz->tbps);
 free_trips:
-       for (i = 0; i < tz->ntrips; i++)
-               of_node_put(tz->trips[i].np);
        kfree(tz->trips);
        of_node_put(trips);
        of_node_put(gchild);
@@ -1028,8 +1022,6 @@ static __init void of_thermal_free_zone(struct __thermal_zone *tz)
        }
 
        kfree(tz->tbps);
-       for (i = 0; i < tz->ntrips; i++)
-               of_node_put(tz->trips[i].np);
        kfree(tz->trips);
        kfree(tz);
 }