Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8416c5bd authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / processor: remove phys_id in acpi_processor_get_info() 



Use pr->phys_id to replace phys_id to simplify the code.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 05eb3cd8

drivers/acpi/acpi_processor.c

+3 −4
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	union acpi_object object = { 0 };

	struct acpi_buffer buffer = { sizeof(union acpi_object), &object };

	struct acpi_processor *pr = acpi_driver_data(device);

	phys_cpuid_t phys_id;

	int device_declaration = 0;

	acpi_status status = AE_OK;

	static int cpu0_initialized;
@@ -263,10 +262,10 @@ static int acpi_processor_get_info(struct acpi_device *device) 
		pr->acpi_id = value;

	}



	phys_id = acpi_get_phys_id(pr->handle, device_declaration, pr->acpi_id);

	if (phys_id == PHYS_CPUID_INVALID)

	pr->phys_id = acpi_get_phys_id(pr->handle, device_declaration,

					pr->acpi_id);

	if (pr->phys_id == PHYS_CPUID_INVALID)

		acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");

	pr->phys_id = phys_id;



	pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id);

	if (!cpu0_initialized && !acpi_has_cpu_in_madt()) {