Commit 11fde939 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: netlink: Rework notify API for cooling devices 



In analogy with some previous thermal netlink API changes, redefine
thermal_notify_cdev_state_update(), thermal_notify_cdev_add() and
thermal_notify_cdev_delete() to take a const cdev pointer as their
first argument and let them extract the requisite information from
there by themselves.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 57a427c8

drivers/thermal/thermal_helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev, int s 
	 */

	ret = cdev->ops->set_cur_state(cdev, state);

	if (!ret) {

		thermal_notify_cdev_state_update(cdev->id, state);

		thermal_notify_cdev_state_update(cdev, state);

		thermal_cooling_device_stats_update(cdev, state);

		thermal_debug_cdev_state_update(cdev, state);

	}

drivers/thermal/thermal_netlink.c

+8 −7
Original line number Diff line number Diff line
@@ -364,24 +364,25 @@ int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, 
	return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_CHANGE, &p);

}



int thermal_notify_cdev_state_update(int cdev_id, int cdev_state)

int thermal_notify_cdev_state_update(const struct thermal_cooling_device *cdev,

				     int state)

{

	struct param p = { .cdev_id = cdev_id, .cdev_state = cdev_state };

	struct param p = { .cdev_id = cdev->id, .cdev_state = state };



	return thermal_genl_send_event(THERMAL_GENL_EVENT_CDEV_STATE_UPDATE, &p);

}



int thermal_notify_cdev_add(int cdev_id, const char *name, int cdev_max_state)

int thermal_notify_cdev_add(const struct thermal_cooling_device *cdev)

{

	struct param p = { .cdev_id = cdev_id, .name = name,

			   .cdev_max_state = cdev_max_state };

	struct param p = { .cdev_id = cdev->id, .name = cdev->type,

			   .cdev_max_state = cdev->max_state };



	return thermal_genl_send_event(THERMAL_GENL_EVENT_CDEV_ADD, &p);

}



int thermal_notify_cdev_delete(int cdev_id)

int thermal_notify_cdev_delete(const struct thermal_cooling_device *cdev)

{

	struct param p = { .cdev_id = cdev_id };

	struct param p = { .cdev_id = cdev->id };



	return thermal_genl_send_event(THERMAL_GENL_EVENT_CDEV_DELETE, &p);

}

drivers/thermal/thermal_netlink.h

+9 −7
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct thermal_genl_cpu_caps { 


struct thermal_zone_device;

struct thermal_trip;

struct thermal_cooling_device;



/* Netlink notification function */

#ifdef CONFIG_THERMAL_NETLINK
@@ -27,9 +28,10 @@ int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz, 
			      const struct thermal_trip *trip);

int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz,

				  const struct thermal_trip *trip);

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_cdev_state_update(const struct thermal_cooling_device *cdev,

				     int state);

int thermal_notify_cdev_add(const struct thermal_cooling_device *cdev);

int thermal_notify_cdev_delete(const struct thermal_cooling_device *cdev);

int thermal_notify_tz_gov_change(const struct thermal_zone_device *tz,

				 const char *name);

int thermal_genl_sampling_temp(int id, int temp);
@@ -79,18 +81,18 @@ static inline int thermal_notify_tz_trip_change(const struct thermal_zone_device 
	return 0;

}



static inline int thermal_notify_cdev_state_update(int cdev_id, int state)

static inline int thermal_notify_cdev_state_update(const struct thermal_cooling_device *cdev,

						   int state)

{

	return 0;

}



static inline int thermal_notify_cdev_add(int cdev_id, const char *name,

					  int max_state)

static inline int thermal_notify_cdev_add(const struct thermal_cooling_device *cdev)

{

	return 0;

}



static inline int thermal_notify_cdev_delete(int cdev_id)

static inline int thermal_notify_cdev_delete(const struct thermal_cooling_device *cdev)

{

	return 0;

}