summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-03-31 19:32:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-03-31 19:32:43 +0200
commitd4d8516624e1042d33011cf93b6e9c220a22c9f0 (patch)
tree363a530076d20796032f24cef6774e66e573cd37 /drivers/regulator
parentae817e618d4b5d221daae34d32a39476e4bdcb36 (diff)
parent85b52122e5426e15602c0b979012e50d7271ea1a (diff)
downloadlinux-stable-d4d8516624e1042d33011cf93b6e9c220a22c9f0.tar.gz
linux-stable-d4d8516624e1042d33011cf93b6e9c220a22c9f0.tar.bz2
linux-stable-d4d8516624e1042d33011cf93b6e9c220a22c9f0.zip
Merge back Intel thermal driver changes for 6.4-rc1.
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max8973-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 7e00a45db26a..303426135276 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -436,7 +436,7 @@ static int max8973_init_dcdc(struct max8973_chip *max,
static int max8973_thermal_read_temp(struct thermal_zone_device *tz, int *temp)
{
- struct max8973_chip *mchip = tz->devdata;
+ struct max8973_chip *mchip = thermal_zone_device_priv(tz);
unsigned int val;
int ret;