Skip to content

Commit

Permalink
thermal: netlink: Pass thermal zone pointer to notify routines
Browse files Browse the repository at this point in the history 
There are several rountines in the thermal netlink API that take a
thermal zone ID or a thermal zone type as their arguments, but from
their callers perspective it would be more convenient to pass a thermal
zone pointer to them and let them extract the necessary data from the
given thermal zone object by themselves.

Modify the code accordingly.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Rafael J. Wysocki committed Jan 9, 2024
1 parent 4ae535f commit 2f52189
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
13 changes: 5 additions & 8 deletions drivers/thermal/thermal_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ int thermal_zone_device_set_policy(struct thermal_zone_device *tz,
mutex_unlock(&tz->lock);
mutex_unlock(&thermal_governor_lock);

thermal_notify_tz_gov_change(tz->id, policy);
thermal_notify_tz_gov_change(tz, policy);

return ret;
}
Expand Down Expand Up @@ -501,9 +501,9 @@ static int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
mutex_unlock(&tz->lock);

if (mode == THERMAL_DEVICE_ENABLED)
thermal_notify_tz_enable(tz->id);
thermal_notify_tz_enable(tz);
else
thermal_notify_tz_disable(tz->id);
thermal_notify_tz_disable(tz);

return ret;
}
Expand Down Expand Up @@ -1407,7 +1407,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
if (atomic_cmpxchg(&tz->need_update, 1, 0))
thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);

thermal_notify_tz_create(tz->id, tz->type);
thermal_notify_tz_create(tz);

return tz;

Expand Down Expand Up @@ -1466,15 +1466,12 @@ EXPORT_SYMBOL_GPL(thermal_zone_device);
*/
void thermal_zone_device_unregister(struct thermal_zone_device *tz)
{
int tz_id;
struct thermal_cooling_device *cdev;
struct thermal_zone_device *pos = NULL;

if (!tz)
return;

tz_id = tz->id;

mutex_lock(&thermal_list_lock);
list_for_each_entry(pos, &thermal_tz_list, node)
if (pos == tz)
Expand Down Expand Up @@ -1510,7 +1507,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)

put_device(&tz->device);

thermal_notify_tz_delete(tz_id);
thermal_notify_tz_delete(tz);

wait_for_completion(&tz->removal);
kfree(tz);
Expand Down
21 changes: 11 additions & 10 deletions drivers/thermal/thermal_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,30 +304,30 @@ static int thermal_genl_send_event(enum thermal_genl_event event,
return ret;
}

int thermal_notify_tz_create(int tz_id, const char *name)
int thermal_notify_tz_create(const struct thermal_zone_device *tz)
{
struct param p = { .tz_id = tz_id, .name = name };
struct param p = { .tz_id = tz->id, .name = tz->type };

return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_CREATE, &p);
}

int thermal_notify_tz_delete(int tz_id)
int thermal_notify_tz_delete(const struct thermal_zone_device *tz)
{
struct param p = { .tz_id = tz_id };
struct param p = { .tz_id = tz->id };

return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_DELETE, &p);
}

int thermal_notify_tz_enable(int tz_id)
int thermal_notify_tz_enable(const struct thermal_zone_device *tz)
{
struct param p = { .tz_id = tz_id };
struct param p = { .tz_id = tz->id };

return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_ENABLE, &p);
}

int thermal_notify_tz_disable(int tz_id)
int thermal_notify_tz_disable(const struct thermal_zone_device *tz)
{
struct param p = { .tz_id = tz_id };
struct param p = { .tz_id = tz->id };

return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_DISABLE, &p);
}
Expand Down Expand Up @@ -386,9 +386,10 @@ int thermal_notify_cdev_delete(int cdev_id)
return thermal_genl_send_event(THERMAL_GENL_EVENT_CDEV_DELETE, &p);
}

int thermal_notify_tz_gov_change(int tz_id, const char *name)
int thermal_notify_tz_gov_change(const struct thermal_zone_device *tz,
const char *name)
{
struct param p = { .tz_id = tz_id, .name = name };
struct param p = { .tz_id = tz->id, .name = name };

return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_GOV_CHANGE, &p);
}
Expand Down
22 changes: 12 additions & 10 deletions drivers/thermal/thermal_netlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ struct thermal_trip;
#ifdef CONFIG_THERMAL_NETLINK
int __init thermal_netlink_init(void);
void __init thermal_netlink_exit(void);
int thermal_notify_tz_create(int tz_id, const char *name);
int thermal_notify_tz_delete(int tz_id);
int thermal_notify_tz_enable(int tz_id);
int thermal_notify_tz_disable(int tz_id);
int thermal_notify_tz_create(const struct thermal_zone_device *tz);
int thermal_notify_tz_delete(const struct thermal_zone_device *tz);
int thermal_notify_tz_enable(const struct thermal_zone_device *tz);
int thermal_notify_tz_disable(const struct thermal_zone_device *tz);
int thermal_notify_tz_trip_down(const struct thermal_zone_device *tz,
const struct thermal_trip *trip);
int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz,
Expand All @@ -30,7 +30,8 @@ int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz,
int thermal_notify_cdev_state_update(int cdev_id, int state);
int thermal_notify_cdev_add(int cdev_id, const char *name, int max_state);
int thermal_notify_cdev_delete(int cdev_id);
int thermal_notify_tz_gov_change(int tz_id, const char *name);
int thermal_notify_tz_gov_change(const struct thermal_zone_device *tz,
const char *name);
int thermal_genl_sampling_temp(int id, int temp);
int thermal_genl_cpu_capability_event(int count,
struct thermal_genl_cpu_caps *caps);
Expand All @@ -40,22 +41,22 @@ static inline int thermal_netlink_init(void)
return 0;
}

static inline int thermal_notify_tz_create(int tz_id, const char *name)
static inline int thermal_notify_tz_create(const struct thermal_zone_device *tz)
{
return 0;
}

static inline int thermal_notify_tz_delete(int tz_id)
static inline int thermal_notify_tz_delete(const struct thermal_zone_device *tz)
{
return 0;
}

static inline int thermal_notify_tz_enable(int tz_id)
static inline int thermal_notify_tz_enable(const struct thermal_zone_device *tz)
{
return 0;
}

static inline int thermal_notify_tz_disable(int tz_id)
static inline int thermal_notify_tz_disable(const struct thermal_zone_device *tz)
{
return 0;
}
Expand Down Expand Up @@ -94,7 +95,8 @@ static inline int thermal_notify_cdev_delete(int cdev_id)
return 0;
}

static inline int thermal_notify_tz_gov_change(int tz_id, const char *name)
static inline int thermal_notify_tz_gov_change(const struct thermal_zone_device *tz,
const char *name)
{
return 0;
}
Expand Down

0 comments on commit 2f52189

Please sign in to comment.