Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal/of: Initialize trip points separately

Browse Source 
Self contain the trip initialization from the device tree in a single
function for the sake of making the code flow more clear.

Cc: Alexandre Bailon <abailon@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220722200007.1839356-11-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Daniel Lezcano 2022-07-22 22:00:07 +02:00 committed by Daniel Lezcano
parent 14ccb5edd7
commit d0c75fa2c1
1 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
drivers/thermal/thermal_of.c
View File

@ -693,7 +693,8 @@ static int of_find_trip_id(struct device_node *np, struct device_node *trip)
*
* Return: 0 on success, proper error code otherwise
*/
static int thermal_of_populate_bind_params(struct device_node *np,
static int thermal_of_populate_bind_params(struct device_node *tz_np,
struct device_node *np,
struct __thermal_bind_params *__tbp)
{
struct of_phandle_args cooling_spec;
@ -715,7 +716,7 @@ static int thermal_of_populate_bind_params(struct device_node *np,
return -ENODEV;
}
trip_id = of_find_trip_id(np, trip);
trip_id = of_find_trip_id(tz_np, trip);
if (trip_id < 0) {
ret = trip_id;
goto end;
@ -849,6 +850,53 @@ static int thermal_of_populate_trip(struct device_node *np,
return 0;
}
static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips)
{
struct thermal_trip *tt;
struct device_node *trips, *trip;
int ret, count;
trips = of_get_child_by_name(np, "trips");
if (!trips) {
pr_err("Failed to find 'trips' node\n");
return ERR_PTR(-EINVAL);
}
count = of_get_child_count(trips);
if (!count) {
pr_err("No trip point defined\n");
ret = -EINVAL;
goto out_of_node_put;
}
tt = kzalloc(sizeof(*tt) * count, GFP_KERNEL);
if (!tt) {
ret = -ENOMEM;
goto out_of_node_put;
}
*ntrips = count;
count = 0;
for_each_child_of_node(trips, trip) {
ret = thermal_of_populate_trip(trip, &tt[count++]);
if (ret)
goto out_kfree;
}
of_node_put(trips);
return tt;
out_kfree:
kfree(tt);
*ntrips = 0;
out_of_node_put:
of_node_put(trips);
return ERR_PTR(ret);
}
/**
* thermal_of_build_thermal_zone - parse and fill one thermal zone data
* @np: DT node containing a thermal zone node
@ -867,7 +915,6 @@ static struct __thermal_zone
__init *thermal_of_build_thermal_zone(struct device_node *np)
{
struct device_node *child = NULL, *gchild;
struct device_node *trips;
struct __thermal_zone *tz;
int ret, i;
u32 prop, coef[2];
@ -909,28 +956,10 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
tz->offset = 0;
}
/* trips */
trips = of_get_child_by_name(np, "trips");
/* No trips provided */
if (!trips)
tz->trips = thermal_of_trips_init(np, &tz->ntrips);
if (IS_ERR(tz->trips)) {
ret = PTR_ERR(tz->trips);
goto finish;
tz->ntrips = of_get_child_count(trips);
if (tz->ntrips == 0) /* must have at least one child */
goto finish;
tz->trips = kcalloc(tz->ntrips, sizeof(*tz->trips), GFP_KERNEL);
if (!tz->trips) {
ret = -ENOMEM;
goto free_tz;
}
i = 0;
for_each_child_of_node(trips, gchild) {
ret = thermal_of_populate_trip(gchild, &tz->trips[i++]);
if (ret)
goto free_trips;
}
/* cooling-maps */
@ -952,13 +981,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
i = 0;
for_each_child_of_node(child, gchild) {
ret = thermal_of_populate_bind_params(gchild, &tz->tbps[i++]);
if (ret)
ret = thermal_of_populate_bind_params(np, gchild, &tz->tbps[i++]);
if (ret) {
of_node_put(gchild);
goto free_tbps;
}
}
finish:
of_node_put(trips);
of_node_put(child);
return tz;
@ -977,8 +1007,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
kfree(tz->tbps);
free_trips:
kfree(tz->trips);
of_node_put(trips);
of_node_put(gchild);
free_tz:
kfree(tz);
of_node_put(child);