diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-27 13:46:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-27 13:46:13 +0200 |
| commit | ce07727aff5bec20f29abe9263a51ed6a355b228 (patch) | |
| tree | 6426666f65b35ced021c82458d9463f19bec2f4a /drivers/thermal/amlogic_thermal.c | |
| parent | 6babf38d894bec696761c10fbfccafceae76f4eb (diff) | |
| parent | 2b6db9efa50799fa75ce609f24b355f29504bd9a (diff) | |
| download | lwn-ce07727aff5bec20f29abe9263a51ed6a355b228.tar.gz lwn-ce07727aff5bec20f29abe9263a51ed6a355b228.zip | |
Merge back thermal control material 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); |