summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-04-14 17:14:02 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-04-14 17:14:02 +0200
commit065ca2a8c6ee601d990ea10efc71b861c5afc4fd (patch)
treeb158f7026bdf08cbc2fdd7675568e76342af4336 /drivers/iio
parent117e4e5bd9d47b89777dbf6b37a709dcfe59520f (diff)
parentd4d8516624e1042d33011cf93b6e9c220a22c9f0 (diff)
Merge back Intel thermal control material for 6.4-rc1.
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/sun4i-gpadc-iio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index a6ade70dedf8..a5322550c422 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -414,7 +414,7 @@ static int sun4i_gpadc_runtime_resume(struct device *dev)
static int sun4i_gpadc_get_temp(struct thermal_zone_device *tz, int *temp)
{
- struct sun4i_gpadc_iio *info = tz->devdata;
+ struct sun4i_gpadc_iio *info = thermal_zone_device_priv(tz);
int val, scale, offset;
if (sun4i_gpadc_temp_read(info->indio_dev, &val))