Skip to content

Commit 2b1ddb5

Browse files
committed
Merge tag 'acpi-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These fix issues introduced by recent changes related to the handling of ACPI device properties and a coding mistake in the exit path of the ACPI processor driver. Specifics: - Prevent acpi_thermal_cpufreq_exit() from attempting to remove the same frequency QoS request multiple times (Riwen Lu) - Fix type detection for integer ACPI device properties (Stefan Binding) - Avoid emitting false-positive warnings when processing ACPI device properties and drop the useless default case from the acpi_copy_property_array_uint() macro (Sakari Ailus)" * tag 'acpi-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: property: Remove default association from integer maximum values ACPI: property: Ignore already existing data node tags ACPI: property: Fix type detection of unified integer reading functions ACPI: processor: Remove freq Qos request for all CPUs
2 parents dee1873 + 2413a85 commit 2b1ddb5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

drivers/acpi/processor_thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void acpi_thermal_cpufreq_exit(struct cpufreq_policy *policy)
151151
unsigned int cpu;
152152

153153
for_each_cpu(cpu, policy->related_cpus) {
154-
struct acpi_processor *pr = per_cpu(processors, policy->cpu);
154+
struct acpi_processor *pr = per_cpu(processors, cpu);
155155

156156
if (pr)
157157
freq_qos_remove_request(&pr->thermal_req);

drivers/acpi/property.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static bool acpi_tie_nondev_subnodes(struct acpi_device_data *data)
370370
bool ret;
371371

372372
status = acpi_attach_data(dn->handle, acpi_nondev_subnode_tag, dn);
373-
if (ACPI_FAILURE(status)) {
373+
if (ACPI_FAILURE(status) && status != AE_ALREADY_EXISTS) {
374374
acpi_handle_err(dn->handle, "Can't tag data node\n");
375375
return false;
376376
}
@@ -1043,11 +1043,10 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data,
10431043
break; \
10441044
} \
10451045
if (__items[i].integer.value > _Generic(__val, \
1046-
u8: U8_MAX, \
1047-
u16: U16_MAX, \
1048-
u32: U32_MAX, \
1049-
u64: U64_MAX, \
1050-
default: 0U)) { \
1046+
u8 *: U8_MAX, \
1047+
u16 *: U16_MAX, \
1048+
u32 *: U32_MAX, \
1049+
u64 *: U64_MAX)) { \
10511050
ret = -EOVERFLOW; \
10521051
break; \
10531052
} \

0 commit comments

Comments
 (0)