Commit 2b1ddb59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dee18737 2413a852

drivers/acpi/processor_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ void acpi_thermal_cpufreq_exit(struct cpufreq_policy *policy) 
	unsigned int cpu;



	for_each_cpu(cpu, policy->related_cpus) {

		struct acpi_processor *pr = per_cpu(processors, policy->cpu);

		struct acpi_processor *pr = per_cpu(processors, cpu);



		if (pr)

			freq_qos_remove_request(&pr->thermal_req);

drivers/acpi/property.c

+5 −6
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static bool acpi_tie_nondev_subnodes(struct acpi_device_data *data) 
		bool ret;



		status = acpi_attach_data(dn->handle, acpi_nondev_subnode_tag, dn);

		if (ACPI_FAILURE(status)) {

		if (ACPI_FAILURE(status) && status != AE_ALREADY_EXISTS) {

			acpi_handle_err(dn->handle, "Can't tag data node\n");

			return false;

		}
@@ -1043,11 +1043,10 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data, 
				break;					\

			}						\

			if (__items[i].integer.value > _Generic(__val,	\

								u8: U8_MAX, \

								u16: U16_MAX, \

								u32: U32_MAX, \

								u64: U64_MAX, \

								default: 0U)) { \

								u8 *: U8_MAX, \

								u16 *: U16_MAX, \

								u32 *: U32_MAX, \

								u64 *: U64_MAX)) { \

				ret = -EOVERFLOW;			\

				break;					\

			}						\