Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50125a9b authored by Durgadoss R's avatar Durgadoss R Committed by Zhang Rui
Browse files

Thermal: Pass zone parameters as argument to tzd_register 



This patch adds the thermal zone parameter as an argument to
the tzd_register() function call; and updates other drivers
using this function.

Signed-off-by: default avatarDurgadoss R <durgadoss.r@intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent ef873947

drivers/acpi/thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -900,14 +900,14 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) 
	if (tz->trips.passive.flags.valid)

		tz->thermal_zone =

			thermal_zone_device_register("acpitz", trips, 0, tz,

						     &acpi_thermal_zone_ops,

						&acpi_thermal_zone_ops, NULL,

						     tz->trips.passive.tsp*100,

						     tz->polling_frequency*100);

	else

		tz->thermal_zone =

			thermal_zone_device_register("acpitz", trips, 0, tz,

						     &acpi_thermal_zone_ops, 0,

						     tz->polling_frequency*100);

						&acpi_thermal_zone_ops, NULL,

						0, tz->polling_frequency*100);

	if (IS_ERR(tz->thermal_zone))

		return -ENODEV;

drivers/platform/x86/acerhdf.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static int acerhdf_register_thermal(void) 
		return -EINVAL;



	thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,

					      &acerhdf_dev_ops, 0,

					      &acerhdf_dev_ops, NULL, 0,

					      (kernelmode) ? interval*1000 : 0);

	if (IS_ERR(thz_dev))

		return -EINVAL;

drivers/platform/x86/intel_mid_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) 
			goto err;

		}

		pinfo->tzd[i] = thermal_zone_device_register(name[i],

				0, 0, td_info, &tzd_ops, 0, 0);

				0, 0, td_info, &tzd_ops, NULL, 0, 0);

		if (IS_ERR(pinfo->tzd[i])) {

			kfree(td_info);

			ret = PTR_ERR(pinfo->tzd[i]);

drivers/power/power_supply_core.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy) 
	for (i = 0; i < psy->num_properties; i++) {

		if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {

			psy->tzd = thermal_zone_device_register(psy->name, 0, 0,

					psy, &psy_tzd_ops, 0, 0);

					psy, &psy_tzd_ops, NULL, 0, 0);

			if (IS_ERR(psy->tzd))

				return PTR_ERR(psy->tzd);

			break;

drivers/staging/omap-thermal/omap-thermal-common.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, 
	/* Create thermal zone */

	data->omap_thermal = thermal_zone_device_register(domain,

				OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,

				FAST_TEMP_MONITORING_RATE,

				NULL, FAST_TEMP_MONITORING_RATE,

				FAST_TEMP_MONITORING_RATE);

	if (IS_ERR_OR_NULL(data->omap_thermal)) {

		dev_err(bg_ptr->dev, "thermal zone device is NULL\n");