diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-02-28 20:47:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-02-28 20:47:57 +0100 |
| commit | 075c3c483c86aaeadbfdb56ff0ffa67abe582eca (patch) | |
| tree | e2e1500d3247ac20b61b9b9ab996e114c496698d /drivers/cpufreq | |
| parent | Merge branch 'cpufreq/arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | cpufreq: longhaul: Replace acpi_bus_get_device() (diff) | |
| download | linux-075c3c483c86aaeadbfdb56ff0ffa67abe582eca.tar.xz linux-075c3c483c86aaeadbfdb56ff0ffa67abe582eca.zip | |
Merge back cpufreq changes for v5.18.
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_governor_attr_set.c | 5 | ||||
| -rw-r--r-- | drivers/cpufreq/longhaul.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/cpufreq/cpufreq_governor_attr_set.c b/drivers/cpufreq/cpufreq_governor_attr_set.c index a6f365b9cc1a..771770ea0ed0 100644 --- a/drivers/cpufreq/cpufreq_governor_attr_set.c +++ b/drivers/cpufreq/cpufreq_governor_attr_set.c @@ -8,11 +8,6 @@ #include "cpufreq_governor.h" -static inline struct gov_attr_set *to_gov_attr_set(struct kobject *kobj) -{ - return container_of(kobj, struct gov_attr_set, kobj); -} - static inline struct governor_attr *to_gov_attr(struct attribute *attr) { return container_of(attr, struct governor_attr, attr); diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c index c538a153ee82..3e000e1a75c6 100644 --- a/drivers/cpufreq/longhaul.c +++ b/drivers/cpufreq/longhaul.c @@ -668,9 +668,9 @@ static acpi_status longhaul_walk_callback(acpi_handle obj_handle, u32 nesting_level, void *context, void **return_value) { - struct acpi_device *d; + struct acpi_device *d = acpi_fetch_acpi_dev(obj_handle); - if (acpi_bus_get_device(obj_handle, &d)) + if (!d) return 0; *return_value = acpi_driver_data(d); |