Replace the manual cpufreq_cpu_put() with __free(put_cpufreq_policy)
annotation for policy references. This reduces the risk of reference
counting mistakes and aligns the code with the latest kernel style.
No functional change intended.
Signed-off-by: Zihuan Zhang <zhangzih...@kylinos.cn>
---
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 0cf0826b805a..c0db27670974 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -27,7 +27,6 @@
/* common data structures */
struct ti_thermal_data {
- struct cpufreq_policy *policy;
struct thermal_zone_device *ti_thermal;
struct thermal_zone_device *pcb_tz;
struct thermal_cooling_device *cool_dev;
@@ -218,6 +217,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp,
int id)
{
struct ti_thermal_data *data;
struct device_node *np = bgp->dev->of_node;
+ struct cpufreq_policy *policy __free(put_cpufreq_policy);
/*
* We are assuming here that if one deploys the zone
@@ -234,8 +234,8 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp,
int id)
if (!data)
return -EINVAL;
- data->policy = cpufreq_cpu_get(0);
- if (!data->policy) {
+ policy = cpufreq_cpu_get(0);
+ if (!policy) {
pr_debug("%s: CPUFreq policy not found\n", __func__);
return -EPROBE_DEFER;
}
@@ -246,7 +246,6 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp,
int id)
int ret = PTR_ERR(data->cool_dev);
dev_err(bgp->dev, "Failed to register cpu cooling device %d\n",
ret);
- cpufreq_cpu_put(data->policy);
return ret;
}
@@ -261,11 +260,8 @@ int ti_thermal_unregister_cpu_cooling(struct ti_bandgap
*bgp, int id)
data = ti_bandgap_get_sensor_data(bgp, id);
- if (!IS_ERR_OR_NULL(data)) {
+ if (!IS_ERR_OR_NULL(data))
cpufreq_cooling_unregister(data->cool_dev);
- if (data->policy)
- cpufreq_cpu_put(data->policy);
- }
return 0;
}
--
2.25.1
