diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 17:14:02 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 17:14:02 +0200 |
commit | 065ca2a8c6ee601d990ea10efc71b861c5afc4fd (patch) | |
tree | b158f7026bdf08cbc2fdd7675568e76342af4336 /drivers/iio/adc | |
parent | thermal: intel: Avoid updating unsupported THERM_STATUS_CLEAR mask bits (diff) | |
parent | Merge back Intel thermal driver changes for 6.4-rc1. (diff) | |
download | linux-065ca2a8c6ee601d990ea10efc71b861c5afc4fd.tar.xz linux-065ca2a8c6ee601d990ea10efc71b861c5afc4fd.zip |
Merge back Intel thermal control material for 6.4-rc1.
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r-- | drivers/iio/adc/sun4i-gpadc-iio.c | 2 |
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)) |