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

Merge back Intel thermal driver changes for 6.4-rc1.

parents ae817e61 85b52122

drivers/acpi/thermal.c

+9 −9
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) 


static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);

	int result;



	if (!tz)
@@ -516,7 +516,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) 
static int thermal_get_trip_type(struct thermal_zone_device *thermal,

				 int trip, enum thermal_trip_type *type)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);

	int i;



	if (!tz || trip < 0)
@@ -560,7 +560,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal, 
static int thermal_get_trip_temp(struct thermal_zone_device *thermal,

				 int trip, int *temp)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);

	int i;



	if (!tz || trip < 0)
@@ -613,7 +613,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 
static int thermal_get_crit_temp(struct thermal_zone_device *thermal,

				int *temperature)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);



	if (tz->trips.critical.flags.valid) {

		*temperature = deci_kelvin_to_millicelsius_with_offset(
@@ -628,7 +628,7 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal, 
static int thermal_get_trend(struct thermal_zone_device *thermal,

			     int trip, enum thermal_trend *trend)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);

	enum thermal_trip_type type;

	int i;
@@ -670,7 +670,7 @@ static int thermal_get_trend(struct thermal_zone_device *thermal, 


static void acpi_thermal_zone_device_hot(struct thermal_zone_device *thermal)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);



	acpi_bus_generate_netlink_event(tz->device->pnp.device_class,

					dev_name(&tz->device->dev),
@@ -679,7 +679,7 @@ static void acpi_thermal_zone_device_hot(struct thermal_zone_device *thermal) 


static void acpi_thermal_zone_device_critical(struct thermal_zone_device *thermal)

{

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);



	acpi_bus_generate_netlink_event(tz->device->pnp.device_class,

					dev_name(&tz->device->dev),
@@ -693,7 +693,7 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, 
					  bool bind)

{

	struct acpi_device *device = cdev->devdata;

	struct acpi_thermal *tz = thermal->devdata;

	struct acpi_thermal *tz = thermal_zone_device_priv(thermal);

	struct acpi_device *dev;

	acpi_handle handle;

	int i;
@@ -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/ata/ahci_imx.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int __sata_ahci_read_temperature(void *dev, int *temp) 


static int sata_ahci_read_temperature(struct thermal_zone_device *tz, int *temp)

{

	return __sata_ahci_read_temperature(tz->devdata, temp);

	return __sata_ahci_read_temperature(thermal_zone_device_priv(tz), temp);

}



static ssize_t sata_ahci_show_temp(struct device *dev,

drivers/hwmon/hwmon.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static DEFINE_IDA(hwmon_ida); 
#ifdef CONFIG_THERMAL_OF

static int hwmon_thermal_get_temp(struct thermal_zone_device *tz, int *temp)

{

	struct hwmon_thermal_data *tdata = tz->devdata;

	struct hwmon_thermal_data *tdata = thermal_zone_device_priv(tz);

	struct hwmon_device *hwdev = to_hwmon_device(tdata->dev);

	int ret;

	long t;
@@ -171,7 +171,7 @@ static int hwmon_thermal_get_temp(struct thermal_zone_device *tz, int *temp) 


static int hwmon_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)

{

	struct hwmon_thermal_data *tdata = tz->devdata;

	struct hwmon_thermal_data *tdata = thermal_zone_device_priv(tz);

	struct hwmon_device *hwdev = to_hwmon_device(tdata->dev);

	const struct hwmon_chip_info *chip = hwdev->chip;

	const struct hwmon_channel_info **info = chip->info;

drivers/hwmon/pmbus/pmbus_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ struct pmbus_thermal_data { 


static int pmbus_thermal_get_temp(struct thermal_zone_device *tz, int *temp)

{

	struct pmbus_thermal_data *tdata = tz->devdata;

	struct pmbus_thermal_data *tdata = thermal_zone_device_priv(tz);

	struct pmbus_sensor *sensor = tdata->sensor;

	struct pmbus_data *pmbus_data = tdata->pmbus_data;

	struct i2c_client *client = to_i2c_client(pmbus_data->dev);

drivers/hwmon/scmi-hwmon.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int scmi_hwmon_thermal_get_temp(struct thermal_zone_device *tz, 
{

	int ret;

	long value;

	struct scmi_thermal_sensor *th_sensor = tz->devdata;

	struct scmi_thermal_sensor *th_sensor = thermal_zone_device_priv(tz);



	ret = scmi_hwmon_read_scaled_value(th_sensor->ph, th_sensor->info,

					   &value);
@@ -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;