| Message ID | 20230221180710.2781027-9-daniel.lezcano@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Self-encapsulate the thermal zone device structure | expand |
On Tue, Feb 21, 2023 at 7:08 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > In order to get the thermal zone id but without directly accessing the > thermal zone device structure, add an accessor. > > Use the accessor from the hwmon_scmi > > No functional change intented. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > Acked-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/hwmon/scmi-hwmon.c | 2 +- > drivers/thermal/thermal_core.c | 6 ++++++ > include/linux/thermal.h | 2 ++ > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c > index 046ac157749d..6681478ea41c 100644 > --- a/drivers/hwmon/scmi-hwmon.c > +++ b/drivers/hwmon/scmi-hwmon.c > @@ -220,7 +220,7 @@ static int scmi_thermal_sensor_register(struct device *dev, > sensor->name); > } else { > dev_dbg(dev, "Sensor '%s' attached to thermal zone ID:%d\n", > - sensor->name, tzd->id); > + sensor->name, thermal_zone_device_get_id(tzd)); > } > > return 0; > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 9fa12147fead..73b7a060f768 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -1384,6 +1384,12 @@ void *thermal_zone_device_priv(struct thermal_zone_device *tzd) > } > EXPORT_SYMBOL_GPL(thermal_zone_device_priv); > > +int thermal_zone_device_get_id(struct thermal_zone_device *tzd) > +{ > + return tzd->id; > +} > +EXPORT_SYMBOL_GPL(thermal_zone_device_get_id); > + > /** > * thermal_zone_device_unregister - removes the registered thermal zone device > * @tz: the thermal zone device to remove > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index 7dbb5712434c..321aa3c71f58 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -367,6 +367,8 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int > > void *thermal_zone_device_priv(struct thermal_zone_device *tzd); > > +int thermal_zone_device_get_id(struct thermal_zone_device *tzd); > + > int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, > struct thermal_cooling_device *, > unsigned long, unsigned long, > -- > 2.34.1 >
diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c index 046ac157749d..6681478ea41c 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c @@ -220,7 +220,7 @@ static int scmi_thermal_sensor_register(struct device *dev, sensor->name); } else { dev_dbg(dev, "Sensor '%s' attached to thermal zone ID:%d\n", - sensor->name, tzd->id); + sensor->name, thermal_zone_device_get_id(tzd)); } return 0; diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 9fa12147fead..73b7a060f768 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1384,6 +1384,12 @@ void *thermal_zone_device_priv(struct thermal_zone_device *tzd) } EXPORT_SYMBOL_GPL(thermal_zone_device_priv); +int thermal_zone_device_get_id(struct thermal_zone_device *tzd) +{ + return tzd->id; +} +EXPORT_SYMBOL_GPL(thermal_zone_device_get_id); + /** * thermal_zone_device_unregister - removes the registered thermal zone device * @tz: the thermal zone device to remove diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 7dbb5712434c..321aa3c71f58 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -367,6 +367,8 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int void *thermal_zone_device_priv(struct thermal_zone_device *tzd); +int thermal_zone_device_get_id(struct thermal_zone_device *tzd); + int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, struct thermal_cooling_device *, unsigned long, unsigned long,