diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-31 19:32:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-31 19:32:43 +0200 |
| commit | d4d8516624e1042d33011cf93b6e9c220a22c9f0 (patch) | |
| tree | 363a530076d20796032f24cef6774e66e573cd37 /drivers/hwmon/hwmon.c | |
| parent | thermal: intel: powerclamp: Fix cpumask and max_idle module parameters (diff) | |
| parent | Merge branch 'thermal-intel' (diff) | |
| download | linux-d4d8516624e1042d33011cf93b6e9c220a22c9f0.tar.xz linux-d4d8516624e1042d33011cf93b6e9c220a22c9f0.zip | |
Merge back Intel thermal driver changes for 6.4-rc1.
Diffstat (limited to 'drivers/hwmon/hwmon.c')
| -rw-r--r-- | drivers/hwmon/hwmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index d193ed3cb35e..11474b272aaf 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -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; |