Merge branch 'thermal-core' into thermal

Merge thermal control updates for 6.4-rc1:

 - Add a thermal zone 'devdata' accessor and modify several drivers to
   use it (Daniel Lezcano).

 - Prevent drivers from using the 'device' internal thermal zone
   structure field directly (Daniel Lezcano).

 - Clean up the hwmon thermal driver (Daniel Lezcano).

 - Add thermal zone id accessor and thermal zone type accessor
   and prevent drivers from using thermal zone fields directly (Daniel
   Lezcano).

 - Clean up the acerhdf and tegra thermal drivers (Daniel Lezcano).

* thermal-core:
  thermal/drivers/acerhdf: Remove pointless governor test
  thermal/drivers/acerhdf: Make interval setting only at module load time
  thermal/drivers/tegra: Remove unneeded lock when setting a trip point
  thermal/hwmon: Use the thermal_core.h header
  thermal/drivers/da9062: Don't access the thermal zone device fields
  thermal: Use thermal_zone_device_type() accessor
  thermal: Add a thermal zone id accessor
  thermal/drivers/spear: Don't use tz->device but pdev->dev
  thermal/core: Add thermal_zone_device structure 'type' accessor
  thermal: Don't use 'device' internal thermal zone structure field
  thermal/hwmon: Use the right device for devm_thermal_add_hwmon_sysfs()
  thermal/hwmon: Do not set no_hwmon before calling thermal_add_hwmon_sysfs()
  thermal: Remove debug or error messages in get_temp() ops
  thermal/core: Show a debug message when get_temp() fails
  thermal/core: Use the thermal zone 'devdata' accessor in remaining drivers
  thermal/core: Use the thermal zone 'devdata' accessor in hwmon located drivers
  thermal/core: Use the thermal zone 'devdata' accessor in thermal located drivers
  thermal/core: Add a thermal zone 'devdata' accessor

diff --combined drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
index 90526f46c9b1104d5d0f28c76cf5e500741ba75c,0404d4db70f07ba7f953e7998be18ebeb2d6f6ad..1a9063f639b0d53f2b94306587546068bb55a7be
--- 1/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
--- 2/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
@@@ -135,7 -135,7 +135,7 @@@ static irqreturn_t proc_thermal_irq_han
  
  static int sys_get_curr_temp(struct thermal_zone_device *tzd, int *temp)
  {
-       struct proc_thermal_pci *pci_info = tzd->devdata;
+       struct proc_thermal_pci *pci_info = thermal_zone_device_priv(tzd);
        u32 _temp;
  
        proc_thermal_mmio_read(pci_info, PROC_THERMAL_MMIO_PKG_TEMP, &_temp);
@@@ -146,7 -146,7 +146,7 @@@
  
  static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp)
  {
-       struct proc_thermal_pci *pci_info = tzd->devdata;
+       struct proc_thermal_pci *pci_info = thermal_zone_device_priv(tzd);
        int tjmax, _temp;
  
        if (temp <= 0) {
@@@ -166,6 -166,7 +166,6 @@@
        proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, _temp);
        proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 1);
  
 -      thermal_zone_device_enable(tzd);
        pci_info->stored_thres = temp;
  
        return 0;
@@@ -267,10 -268,6 +267,10 @@@ static int proc_thermal_pci_probe(struc
                goto err_free_vectors;
        }
  
 +      ret = thermal_zone_device_enable(pci_info->tzone);
 +      if (ret)
 +              goto err_free_vectors;
 +
        return 0;
  
  err_free_vectors: