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/thermal/amlogic_thermal.c | |
| parent | ae817e618d4b5d221daae34d32a39476e4bdcb36 (diff) | |
| parent | 85b52122e5426e15602c0b979012e50d7271ea1a (diff) | |
Merge back Intel thermal driver changes for 6.4-rc1.
Diffstat (limited to 'drivers/thermal/amlogic_thermal.c')
| -rw-r--r-- | drivers/thermal/amlogic_thermal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c index 9235fda4ec1e..4bf36386462f 100644 --- a/drivers/thermal/amlogic_thermal.c +++ b/drivers/thermal/amlogic_thermal.c @@ -181,7 +181,7 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data) static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { unsigned int tval; - struct amlogic_thermal *pdata = tz->devdata; + struct amlogic_thermal *pdata = thermal_zone_device_priv(tz); if (!pdata) return -EINVAL; @@ -285,7 +285,7 @@ static int amlogic_thermal_probe(struct platform_device *pdev) return ret; } - if (devm_thermal_add_hwmon_sysfs(pdata->tzd)) + if (devm_thermal_add_hwmon_sysfs(&pdev->dev, pdata->tzd)) dev_warn(&pdev->dev, "Failed to add hwmon sysfs attributes\n"); ret = amlogic_thermal_initialize(pdata); |