Commit 32bf43e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more thermal control updates from Rafael Wysocki:
 "Eliminate an obsolete thermal zone registration function"

* tag 'thermal-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: core: Drop thermal_zone_device_register()
  thermal: Use thermal_tripless_zone_device_register()
  thermal: core: Add function for registering tripless thermal zones
  thermal: core: Clean up headers of thermal zone registration functions
parents fd88c59e edd220b3

drivers/power/supply/power_supply_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1309,8 +1309,8 @@ static int psy_register_thermal(struct power_supply *psy) 
		struct thermal_zone_params tzp = {

			.no_hwmon = IS_ENABLED(CONFIG_POWER_SUPPLY_HWMON)

		};

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

				0, 0, psy, &psy_tzd_ops, &tzp, 0, 0);

		psy->tzd = thermal_tripless_zone_device_register(psy->desc->name,

				psy, &psy_tzd_ops, &tzp);

		if (IS_ERR(psy->tzd))

			return PTR_ERR(psy->tzd);

		ret = thermal_zone_device_enable(psy->tzd);

drivers/thermal/armada_thermal.c

+3 −2
Original line number Diff line number Diff line
@@ -876,8 +876,9 @@ static int armada_thermal_probe(struct platform_device *pdev) 
		/* Wait the sensors to be valid */

		armada_wait_sensor_validity(priv);



		tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,

						  &legacy_ops, NULL, 0, 0);

		tz = thermal_tripless_zone_device_register(priv->zone_name,

							   priv, &legacy_ops,

							   NULL);

		if (IS_ERR(tz)) {

			dev_err(&pdev->dev,

				"Failed to register thermal zone device\n");

drivers/thermal/dove_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static int dove_thermal_probe(struct platform_device *pdev) 
		return ret;

	}



	thermal = thermal_zone_device_register("dove_thermal", 0, 0,

					       priv, &ops, NULL, 0, 0);

	thermal = thermal_tripless_zone_device_register("dove_thermal", priv,

							&ops, NULL);

	if (IS_ERR(thermal)) {

		dev_err(&pdev->dev,

			"Failed to register thermal zone device\n");

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -609,9 +609,9 @@ static int int3400_thermal_probe(struct platform_device *pdev) 


	evaluate_odvp(priv);



	priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,

						priv, &int3400_thermal_ops,

						&int3400_thermal_params, 0, 0);

	priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,

							      &int3400_thermal_ops,

							      &int3400_thermal_params);

	if (IS_ERR(priv->thermal)) {

		result = PTR_ERR(priv->thermal);

		goto free_art_trt;

drivers/thermal/kirkwood_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->sensor))

		return PTR_ERR(priv->sensor);



	thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0,

					       priv, &ops, NULL, 0, 0);

	thermal = thermal_tripless_zone_device_register("kirkwood_thermal",

							priv, &ops, NULL);

	if (IS_ERR(thermal)) {

		dev_err(&pdev->dev,

			"Failed to register thermal zone device\n");