| Message ID | 20201210121514.25760-5-daniel.lezcano@linaro.org |
|---|---|
| State | Accepted |
| Commit | 04f111130e9afa41c10d7bcec14e00e3be8b6977 |
| Headers | show |
| Series | [1/5] thermal/core: Emit a warning if the thermal zone is updated without ops | expand |
On 12/10/20 12:15 PM, Daniel Lezcano wrote: > With the remove of the notify user in a previous patch, the ops is no > longer needed, remove it. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > drivers/thermal/thermal_core.c | 3 --- > include/linux/thermal.h | 2 -- > 2 files changed, 5 deletions(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index cee0b31b5cd7..d7481fdf4e4c 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -407,9 +407,6 @@ static void handle_critical_trips(struct thermal_zone_device *tz, > > trace_thermal_zone_trip(tz, trip, trip_type); > > - if (tz->ops->notify) > - tz->ops->notify(tz, trip, trip_type); > - > if (trip_type == THERMAL_TRIP_HOT && tz->ops->hot) > tz->ops->hot(tz); > else if (trip_type == THERMAL_TRIP_CRITICAL) > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index 125c8a4d52e6..7e051b4cf715 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -77,8 +77,6 @@ struct thermal_zone_device_ops { > int (*set_emul_temp) (struct thermal_zone_device *, int); > int (*get_trend) (struct thermal_zone_device *, int, > enum thermal_trend *); > - int (*notify) (struct thermal_zone_device *, int, > - enum thermal_trip_type); > void (*hot)(struct thermal_zone_device *); > void (*critical)(struct thermal_zone_device *); > }; > I couldn't find other users apart from those in patch 3/5 and 4/5. I will leave to someone else to review those patches. This patch looks good Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index cee0b31b5cd7..d7481fdf4e4c 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -407,9 +407,6 @@ static void handle_critical_trips(struct thermal_zone_device *tz, trace_thermal_zone_trip(tz, trip, trip_type); - if (tz->ops->notify) - tz->ops->notify(tz, trip, trip_type); - if (trip_type == THERMAL_TRIP_HOT && tz->ops->hot) tz->ops->hot(tz); else if (trip_type == THERMAL_TRIP_CRITICAL) diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 125c8a4d52e6..7e051b4cf715 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -77,8 +77,6 @@ struct thermal_zone_device_ops { int (*set_emul_temp) (struct thermal_zone_device *, int); int (*get_trend) (struct thermal_zone_device *, int, enum thermal_trend *); - int (*notify) (struct thermal_zone_device *, int, - enum thermal_trip_type); void (*hot)(struct thermal_zone_device *); void (*critical)(struct thermal_zone_device *); };
With the remove of the notify user in a previous patch, the ops is no longer needed, remove it. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/thermal_core.c | 3 --- include/linux/thermal.h | 2 -- 2 files changed, 5 deletions(-) -- 2.17.1