| Message ID | 10409811.nUPlyArG6x@kreacher |
|---|---|
| State | New |
| Headers | show |
| Series | thermal: netlink: Redefine the API and drop unused code | expand |
On 12/15/23 19:59, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Because thermal_notify_tz_trip_add/delete() are never used, drop them > entirely along with the related code. > > The addition or removal of trip points is not supported by the thermal > core and is unlikely to be supported in the future, so it is also > unlikely that these functions will ever be needed. > > No intentional functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/thermal/thermal_netlink.c | 33 +-------------------------------- > drivers/thermal/thermal_netlink.h | 14 -------------- > 2 files changed, 1 insertion(+), 46 deletions(-) > > Index: linux-pm/drivers/thermal/thermal_netlink.c > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_netlink.c > +++ linux-pm/drivers/thermal/thermal_netlink.c > @@ -135,7 +135,7 @@ static int thermal_genl_event_tz_trip_up > return 0; > } > > -static int thermal_genl_event_tz_trip_add(struct param *p) > +static int thermal_genl_event_tz_trip_change(struct param *p) > { > if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || > nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id) || > @@ -147,15 +147,6 @@ static int thermal_genl_event_tz_trip_ad > return 0; > } > > -static int thermal_genl_event_tz_trip_delete(struct param *p) > -{ > - if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || > - nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id)) > - return -EMSGSIZE; > - > - return 0; > -} > - > static int thermal_genl_event_cdev_add(struct param *p) > { > if (nla_put_string(p->msg, THERMAL_GENL_ATTR_CDEV_NAME, > @@ -245,9 +236,6 @@ int thermal_genl_event_tz_disable(struct > int thermal_genl_event_tz_trip_down(struct param *p) > __attribute__((alias("thermal_genl_event_tz_trip_up"))); > > -int thermal_genl_event_tz_trip_change(struct param *p) > - __attribute__((alias("thermal_genl_event_tz_trip_add"))); > - > static cb_t event_cb[] = { > [THERMAL_GENL_EVENT_TZ_CREATE] = thermal_genl_event_tz_create, > [THERMAL_GENL_EVENT_TZ_DELETE] = thermal_genl_event_tz_delete, > @@ -256,8 +244,6 @@ static cb_t event_cb[] = { > [THERMAL_GENL_EVENT_TZ_TRIP_UP] = thermal_genl_event_tz_trip_up, > [THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = thermal_genl_event_tz_trip_down, > [THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = thermal_genl_event_tz_trip_change, > - [THERMAL_GENL_EVENT_TZ_TRIP_ADD] = thermal_genl_event_tz_trip_add, > - [THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = thermal_genl_event_tz_trip_delete, > [THERMAL_GENL_EVENT_CDEV_ADD] = thermal_genl_event_cdev_add, > [THERMAL_GENL_EVENT_CDEV_DELETE] = thermal_genl_event_cdev_delete, > [THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = thermal_genl_event_cdev_state_update, > @@ -350,23 +336,6 @@ int thermal_notify_tz_trip_up(const stru > return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p); > } > > -int thermal_notify_tz_trip_add(int tz_id, int trip_id, int trip_type, > - int trip_temp, int trip_hyst) > -{ > - struct param p = { .tz_id = tz_id, .trip_id = trip_id, > - .trip_type = trip_type, .trip_temp = trip_temp, > - .trip_hyst = trip_hyst }; > - > - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_ADD, &p); > -} > - > -int thermal_notify_tz_trip_delete(int tz_id, int trip_id) > -{ > - struct param p = { .tz_id = tz_id, .trip_id = trip_id }; > - > - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DELETE, &p); > -} > - > int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, > const struct thermal_trip *trip) > { > Index: linux-pm/drivers/thermal/thermal_netlink.h > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_netlink.h > +++ linux-pm/drivers/thermal/thermal_netlink.h > @@ -22,9 +22,6 @@ int thermal_notify_tz_trip_down(const st > const struct thermal_trip *trip); > int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz, > const struct thermal_trip *trip); > -int thermal_notify_tz_trip_delete(int tz_id, int id); > -int thermal_notify_tz_trip_add(int tz_id, int id, int type, > - int temp, int hyst); > 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); > @@ -71,17 +68,6 @@ static inline int thermal_notify_tz_trip > { > return 0; > } > - > -static inline int thermal_notify_tz_trip_delete(int tz_id, int id) > -{ > - return 0; > -} > - > -static inline int thermal_notify_tz_trip_add(int tz_id, int id, int type, > - int temp, int hyst) > -{ > - return 0; > -} > > static inline int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, > const struct thermal_trip *trip) > > > We could also add a comment that these two (THERMAL_GENL_EVENT_TZ_TRIP_ADD/DELETE) in the uapi header are obsolete. Other than that this looks good. Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
On Wed, Jan 3, 2024 at 9:06 PM Lukasz Luba <lukasz.luba@arm.com> wrote: > > > > On 12/15/23 19:59, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > Because thermal_notify_tz_trip_add/delete() are never used, drop them > > entirely along with the related code. > > > > The addition or removal of trip points is not supported by the thermal > > core and is unlikely to be supported in the future, so it is also > > unlikely that these functions will ever be needed. > > > > No intentional functional impact. > > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > --- > > drivers/thermal/thermal_netlink.c | 33 +-------------------------------- > > drivers/thermal/thermal_netlink.h | 14 -------------- > > 2 files changed, 1 insertion(+), 46 deletions(-) > > > > Index: linux-pm/drivers/thermal/thermal_netlink.c > > =================================================================== > > --- linux-pm.orig/drivers/thermal/thermal_netlink.c > > +++ linux-pm/drivers/thermal/thermal_netlink.c > > @@ -135,7 +135,7 @@ static int thermal_genl_event_tz_trip_up > > return 0; > > } > > > > -static int thermal_genl_event_tz_trip_add(struct param *p) > > +static int thermal_genl_event_tz_trip_change(struct param *p) > > { > > if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || > > nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id) || > > @@ -147,15 +147,6 @@ static int thermal_genl_event_tz_trip_ad > > return 0; > > } > > > > -static int thermal_genl_event_tz_trip_delete(struct param *p) > > -{ > > - if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || > > - nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id)) > > - return -EMSGSIZE; > > - > > - return 0; > > -} > > - > > static int thermal_genl_event_cdev_add(struct param *p) > > { > > if (nla_put_string(p->msg, THERMAL_GENL_ATTR_CDEV_NAME, > > @@ -245,9 +236,6 @@ int thermal_genl_event_tz_disable(struct > > int thermal_genl_event_tz_trip_down(struct param *p) > > __attribute__((alias("thermal_genl_event_tz_trip_up"))); > > > > -int thermal_genl_event_tz_trip_change(struct param *p) > > - __attribute__((alias("thermal_genl_event_tz_trip_add"))); > > - > > static cb_t event_cb[] = { > > [THERMAL_GENL_EVENT_TZ_CREATE] = thermal_genl_event_tz_create, > > [THERMAL_GENL_EVENT_TZ_DELETE] = thermal_genl_event_tz_delete, > > @@ -256,8 +244,6 @@ static cb_t event_cb[] = { > > [THERMAL_GENL_EVENT_TZ_TRIP_UP] = thermal_genl_event_tz_trip_up, > > [THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = thermal_genl_event_tz_trip_down, > > [THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = thermal_genl_event_tz_trip_change, > > - [THERMAL_GENL_EVENT_TZ_TRIP_ADD] = thermal_genl_event_tz_trip_add, > > - [THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = thermal_genl_event_tz_trip_delete, > > [THERMAL_GENL_EVENT_CDEV_ADD] = thermal_genl_event_cdev_add, > > [THERMAL_GENL_EVENT_CDEV_DELETE] = thermal_genl_event_cdev_delete, > > [THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = thermal_genl_event_cdev_state_update, > > @@ -350,23 +336,6 @@ int thermal_notify_tz_trip_up(const stru > > return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p); > > } > > > > -int thermal_notify_tz_trip_add(int tz_id, int trip_id, int trip_type, > > - int trip_temp, int trip_hyst) > > -{ > > - struct param p = { .tz_id = tz_id, .trip_id = trip_id, > > - .trip_type = trip_type, .trip_temp = trip_temp, > > - .trip_hyst = trip_hyst }; > > - > > - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_ADD, &p); > > -} > > - > > -int thermal_notify_tz_trip_delete(int tz_id, int trip_id) > > -{ > > - struct param p = { .tz_id = tz_id, .trip_id = trip_id }; > > - > > - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DELETE, &p); > > -} > > - > > int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, > > const struct thermal_trip *trip) > > { > > Index: linux-pm/drivers/thermal/thermal_netlink.h > > =================================================================== > > --- linux-pm.orig/drivers/thermal/thermal_netlink.h > > +++ linux-pm/drivers/thermal/thermal_netlink.h > > @@ -22,9 +22,6 @@ int thermal_notify_tz_trip_down(const st > > const struct thermal_trip *trip); > > int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz, > > const struct thermal_trip *trip); > > -int thermal_notify_tz_trip_delete(int tz_id, int id); > > -int thermal_notify_tz_trip_add(int tz_id, int id, int type, > > - int temp, int hyst); > > 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); > > @@ -71,17 +68,6 @@ static inline int thermal_notify_tz_trip > > { > > return 0; > > } > > - > > -static inline int thermal_notify_tz_trip_delete(int tz_id, int id) > > -{ > > - return 0; > > -} > > - > > -static inline int thermal_notify_tz_trip_add(int tz_id, int id, int type, > > - int temp, int hyst) > > -{ > > - return 0; > > -} > > > > static inline int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, > > const struct thermal_trip *trip) > > > > > > > > We could also add a comment that these two > (THERMAL_GENL_EVENT_TZ_TRIP_ADD/DELETE) in the uapi header are obsolete. I'd rather say they are placeholders for message types that have never been sent by the kernel - and nothing changes in that respect after the $subject patch. They have been unused so far and they are still unused (it is easier to figure that out through code inspection, however). And even though it is unlikely that they will be used in the future, it is not entirely unimaginable. > Other than that this looks good. > > Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Thanks a lot for all of the reviews!
On 04/01/2024 12:12, Rafael J. Wysocki wrote: > On Wed, Jan 3, 2024 at 9:06 PM Lukasz Luba <lukasz.luba@arm.com> wrote: >> >> >> >> On 12/15/23 19:59, Rafael J. Wysocki wrote: >>> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> >>> >>> Because thermal_notify_tz_trip_add/delete() are never used, drop them >>> entirely along with the related code. >>> >>> The addition or removal of trip points is not supported by the thermal >>> core and is unlikely to be supported in the future, so it is also >>> unlikely that these functions will ever be needed. >>> >>> No intentional functional impact. >>> >>> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Index: linux-pm/drivers/thermal/thermal_netlink.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_netlink.c +++ linux-pm/drivers/thermal/thermal_netlink.c @@ -135,7 +135,7 @@ static int thermal_genl_event_tz_trip_up return 0; } -static int thermal_genl_event_tz_trip_add(struct param *p) +static int thermal_genl_event_tz_trip_change(struct param *p) { if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id) || @@ -147,15 +147,6 @@ static int thermal_genl_event_tz_trip_ad return 0; } -static int thermal_genl_event_tz_trip_delete(struct param *p) -{ - if (nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_ID, p->tz_id) || - nla_put_u32(p->msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, p->trip_id)) - return -EMSGSIZE; - - return 0; -} - static int thermal_genl_event_cdev_add(struct param *p) { if (nla_put_string(p->msg, THERMAL_GENL_ATTR_CDEV_NAME, @@ -245,9 +236,6 @@ int thermal_genl_event_tz_disable(struct int thermal_genl_event_tz_trip_down(struct param *p) __attribute__((alias("thermal_genl_event_tz_trip_up"))); -int thermal_genl_event_tz_trip_change(struct param *p) - __attribute__((alias("thermal_genl_event_tz_trip_add"))); - static cb_t event_cb[] = { [THERMAL_GENL_EVENT_TZ_CREATE] = thermal_genl_event_tz_create, [THERMAL_GENL_EVENT_TZ_DELETE] = thermal_genl_event_tz_delete, @@ -256,8 +244,6 @@ static cb_t event_cb[] = { [THERMAL_GENL_EVENT_TZ_TRIP_UP] = thermal_genl_event_tz_trip_up, [THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = thermal_genl_event_tz_trip_down, [THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = thermal_genl_event_tz_trip_change, - [THERMAL_GENL_EVENT_TZ_TRIP_ADD] = thermal_genl_event_tz_trip_add, - [THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = thermal_genl_event_tz_trip_delete, [THERMAL_GENL_EVENT_CDEV_ADD] = thermal_genl_event_cdev_add, [THERMAL_GENL_EVENT_CDEV_DELETE] = thermal_genl_event_cdev_delete, [THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = thermal_genl_event_cdev_state_update, @@ -350,23 +336,6 @@ int thermal_notify_tz_trip_up(const stru return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p); } -int thermal_notify_tz_trip_add(int tz_id, int trip_id, int trip_type, - int trip_temp, int trip_hyst) -{ - struct param p = { .tz_id = tz_id, .trip_id = trip_id, - .trip_type = trip_type, .trip_temp = trip_temp, - .trip_hyst = trip_hyst }; - - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_ADD, &p); -} - -int thermal_notify_tz_trip_delete(int tz_id, int trip_id) -{ - struct param p = { .tz_id = tz_id, .trip_id = trip_id }; - - return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DELETE, &p); -} - int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, const struct thermal_trip *trip) { Index: linux-pm/drivers/thermal/thermal_netlink.h =================================================================== --- linux-pm.orig/drivers/thermal/thermal_netlink.h +++ linux-pm/drivers/thermal/thermal_netlink.h @@ -22,9 +22,6 @@ int thermal_notify_tz_trip_down(const st const struct thermal_trip *trip); int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz, const struct thermal_trip *trip); -int thermal_notify_tz_trip_delete(int tz_id, int id); -int thermal_notify_tz_trip_add(int tz_id, int id, int type, - int temp, int hyst); 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); @@ -71,17 +68,6 @@ static inline int thermal_notify_tz_trip { return 0; } - -static inline int thermal_notify_tz_trip_delete(int tz_id, int id) -{ - return 0; -} - -static inline int thermal_notify_tz_trip_add(int tz_id, int id, int type, - int temp, int hyst) -{ - return 0; -} static inline int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz, const struct thermal_trip *trip)