Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal soc updates from Eduardo Valentin:

 - thermal core has a new devm_* API for registering cooling devices. I
   took the entire series, that is why you see changes on drivers/hwmon
   in this pull (Guenter Roeck)

 - rockchip thermal driver gains support to PX30 SoC (Elaine Zhang)

 - the generic-adc thermal driver now considers the lookup table DT
   property as optional (Jean-Francois Dagenais)

 - Refactoring of tsens thermal driver (Amit Kucheria)

 - Cleanups on cpu cooling driver (Daniel Lezcano)

 - broadcom thermal driver dropped support to ACPI (Srinath Mannam)

 - tegra thermal driver gains support to OC hw throttle and GPU throtle
   (Wei Ni)

 - Fixes in several thermal drivers.

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (59 commits)
  hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register
  hwmon: (npcm750-pwm-fan) Use devm_thermal_of_cooling_device_register
  hwmon: (mlxreg-fan) Use devm_thermal_of_cooling_device_register
  hwmon: (gpio-fan) Use devm_thermal_of_cooling_device_register
  hwmon: (aspeed-pwm-tacho) Use devm_thermal_of_cooling_device_register
  thermal: rcar_gen3_thermal: Fix to show correct trip points number
  thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs
  thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
  thermal: rockchip: Support the PX30 SoC in thermal driver
  dt-bindings: rockchip-thermal: Support the PX30 SoC compatible
  thermal: rockchip: fix up the tsadc pinctrl setting error
  thermal: broadcom: Remove ACPI support
  thermal: Fix build error of missing devm_ioremap_resource on UM
  thermal/drivers/cpu_cooling: Remove pointless field
  thermal/drivers/cpu_cooling: Add Software Package Data Exchange (SPDX)
  thermal/drivers/cpu_cooling: Fixup the header and copyright
  thermal/drivers/cpu_cooling: Remove pointless test in power2state()
  thermal: rcar_gen3_thermal: disable interrupt in .remove
  thermal: rcar_gen3_thermal: fix interrupt type
  thermal: Introduce devm_thermal_of_cooling_device_register
  ...

1 files changed, 10 insertions, 21 deletions

diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c
index f816d2ae1e58..ed8d59d4eecb 100644
--- a/drivers/hwmon/mlxreg-fan.c
+++ b/drivers/hwmon/mlxreg-fan.c
@@ -465,42 +465,42 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
 static int mlxreg_fan_probe(struct platform_device *pdev)
 {
         struct mlxreg_core_platform_data *pdata;
+        struct device *dev = &pdev->dev;
         struct mlxreg_fan *fan;
         struct device *hwm;
         int err;
 
-        pdata = dev_get_platdata(&pdev->dev);
+        pdata = dev_get_platdata(dev);
         if (!pdata) {
-                dev_err(&pdev->dev, "Failed to get platform data.\n");
+                dev_err(dev, "Failed to get platform data.\n");
                 return -EINVAL;
         }
 
-        fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
+        fan = devm_kzalloc(dev, sizeof(*fan), GFP_KERNEL);
         if (!fan)
                 return -ENOMEM;
 
-        fan->dev = &pdev->dev;
+        fan->dev = dev;
         fan->regmap = pdata->regmap;
-        platform_set_drvdata(pdev, fan);
 
         err = mlxreg_fan_config(fan, pdata);
         if (err)
                 return err;
 
-        hwm = devm_hwmon_device_register_with_info(&pdev->dev, "mlxreg_fan",
+        hwm = devm_hwmon_device_register_with_info(dev, "mlxreg_fan",
                                                    fan,
                                                    &mlxreg_fan_hwmon_chip_info,
                                                    NULL);
         if (IS_ERR(hwm)) {
-                dev_err(&pdev->dev, "Failed to register hwmon device\n");
+                dev_err(dev, "Failed to register hwmon device\n");
                 return PTR_ERR(hwm);
         }
 
         if (IS_REACHABLE(CONFIG_THERMAL)) {
-                fan->cdev = thermal_cooling_device_register("mlxreg_fan", fan,
-                                                &mlxreg_fan_cooling_ops);
+                fan->cdev = devm_thermal_of_cooling_device_register(dev,
+                        NULL, "mlxreg_fan", fan, &mlxreg_fan_cooling_ops);
                 if (IS_ERR(fan->cdev)) {
-                        dev_err(&pdev->dev, "Failed to register cooling device\n");
+                        dev_err(dev, "Failed to register cooling device\n");
                         return PTR_ERR(fan->cdev);
                 }
         }
@@ -508,22 +508,11 @@ static int mlxreg_fan_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int mlxreg_fan_remove(struct platform_device *pdev)
-{
-        struct mlxreg_fan *fan = platform_get_drvdata(pdev);
-
-        if (IS_REACHABLE(CONFIG_THERMAL))
-                thermal_cooling_device_unregister(fan->cdev);
-
-        return 0;
-}
-
 static struct platform_driver mlxreg_fan_driver = {
         .driver = {
             .name = "mlxreg-fan",
         },
         .probe = mlxreg_fan_probe,
-        .remove = mlxreg_fan_remove,
 };
 
 module_platform_driver(mlxreg_fan_driver);