Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

thermal: testing: Use DEFINE_FREE() and __free() to simplify code

Browse Source 
Use DEFINE_FREE() to define a __free function for dropping thermal
zone template reference counters and use it along with __free() to
simplify code in some places.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/4628747.LvFx2qVVIh@rjwysocki.net
[ rjw: Add variable initialization to address compiler warning ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2024-11-10 14:06:01 +01:00
parent 9782dd101f
commit 1c426fd09c
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/thermal/testing/zone.c
View File

@ -305,6 +305,9 @@ static void tt_put_tt_zone(struct tt_thermal_zone *tt_zone)
tt_zone->refcount--; tt_zone->refcount--;
} }
DEFINE_FREE(put_tt_zone, struct tt_thermal_zone *,
if (!IS_ERR_OR_NULL(_T)) tt_put_tt_zone(_T))
static void tt_zone_add_trip_work_fn(struct work_struct *work) static void tt_zone_add_trip_work_fn(struct work_struct *work)
{ {
struct tt_work *tt_work = tt_work_of_work(work); struct tt_work *tt_work = tt_work_of_work(work);
@ -327,9 +330,9 @@ static void tt_zone_add_trip_work_fn(struct work_struct *work)
int tt_zone_add_trip(const char *arg) int tt_zone_add_trip(const char *arg)
{ {
struct tt_thermal_zone *tt_zone __free(put_tt_zone) = NULL;
struct tt_work *tt_work __free(kfree); struct tt_work *tt_work __free(kfree);
struct tt_trip *tt_trip __free(kfree); struct tt_trip *tt_trip __free(kfree);
struct tt_thermal_zone *tt_zone;
int id; int id;
tt_work = kzalloc(sizeof(*tt_work), GFP_KERNEL); tt_work = kzalloc(sizeof(*tt_work), GFP_KERNEL);
@ -345,10 +348,8 @@ int tt_zone_add_trip(const char *arg)
return PTR_ERR(tt_zone); return PTR_ERR(tt_zone);
id = ida_alloc(&tt_zone->ida, GFP_KERNEL); id = ida_alloc(&tt_zone->ida, GFP_KERNEL);
if (id < 0) { if (id < 0)
tt_put_tt_zone(tt_zone);
return id; return id;
}
tt_trip->trip.type = THERMAL_TRIP_ACTIVE; tt_trip->trip.type = THERMAL_TRIP_ACTIVE;
tt_trip->trip.temperature = THERMAL_TEMP_INVALID; tt_trip->trip.temperature = THERMAL_TEMP_INVALID;
@ -361,7 +362,7 @@ int tt_zone_add_trip(const char *arg)
tt_zone->num_trips++; tt_zone->num_trips++;
INIT_WORK(&tt_work->work, tt_zone_add_trip_work_fn); INIT_WORK(&tt_work->work, tt_zone_add_trip_work_fn);
tt_work->tt_zone = tt_zone; tt_work->tt_zone = no_free_ptr(tt_zone);
tt_work->tt_trip = no_free_ptr(tt_trip); tt_work->tt_trip = no_free_ptr(tt_trip);
schedule_work(&(no_free_ptr(tt_work)->work)); schedule_work(&(no_free_ptr(tt_work)->work));
@ -420,23 +421,18 @@ static int tt_zone_register_tz(struct tt_thermal_zone *tt_zone)
int tt_zone_reg(const char *arg) int tt_zone_reg(const char *arg)
{ {
struct tt_thermal_zone *tt_zone; struct tt_thermal_zone *tt_zone __free(put_tt_zone);
int ret;
tt_zone = tt_get_tt_zone(arg); tt_zone = tt_get_tt_zone(arg);
if (IS_ERR(tt_zone)) if (IS_ERR(tt_zone))
return PTR_ERR(tt_zone); return PTR_ERR(tt_zone);
ret = tt_zone_register_tz(tt_zone); return tt_zone_register_tz(tt_zone);
tt_put_tt_zone(tt_zone);
return ret;
} }
int tt_zone_unreg(const char *arg) int tt_zone_unreg(const char *arg)
{ {
struct tt_thermal_zone *tt_zone; struct tt_thermal_zone *tt_zone __free(put_tt_zone);
tt_zone = tt_get_tt_zone(arg); tt_zone = tt_get_tt_zone(arg);
if (IS_ERR(tt_zone)) if (IS_ERR(tt_zone))
@ -444,8 +440,6 @@ int tt_zone_unreg(const char *arg)
tt_zone_unregister_tz(tt_zone); tt_zone_unregister_tz(tt_zone);
tt_put_tt_zone(tt_zone);
return 0; return 0;
} }