Commit 3034f859 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

thermal: Add a thermal zone id accessor 



In order to get the thermal zone id but without directly accessing the
thermal zone device structure, add an accessor.

Use the accessor in the hwmon_scmi and acpi_thermal.

No functional change intented.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 25e43976

drivers/acpi/thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) 
		goto acpi_bus_detach;



	dev_info(&tz->device->dev, "registered as thermal_zone%d\n",

		 tz->thermal_zone->id);

		 thermal_zone_device_id(tz->thermal_zone));



	return 0;

drivers/hwmon/scmi-hwmon.c

+1 −1
Original line number Diff line number Diff line
@@ -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_id(tzd));

	}



	return 0;

drivers/thermal/thermal_core.c

+6 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,12 @@ const char *thermal_zone_device_type(struct thermal_zone_device *tzd) 
}

EXPORT_SYMBOL_GPL(thermal_zone_device_type);



int thermal_zone_device_id(struct thermal_zone_device *tzd)

{

	return tzd->id;

}

EXPORT_SYMBOL_GPL(thermal_zone_device_id);



/**

 * thermal_zone_device_unregister - removes the registered thermal zone device

 * @tz: the thermal zone device to remove

include/linux/thermal.h

+6 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int 


void *thermal_zone_device_priv(struct thermal_zone_device *tzd);

const char *thermal_zone_device_type(struct thermal_zone_device *tzd);

int thermal_zone_device_id(struct thermal_zone_device *tzd);



int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,

				     struct thermal_cooling_device *,
@@ -449,6 +450,11 @@ static inline const char *thermal_zone_device_type(struct thermal_zone_device *t 
	return NULL;

}



static inline int thermal_zone_device_id(struct thermal_zone_device *tzd)

{

	return -ENODEV;

}



static inline int thermal_zone_device_enable(struct thermal_zone_device *tz)

{ return -ENODEV; }