ACPI / processor: Introduce invalid_phys_cpuid()
authorHanjun Guo <hanjun.guo@linaro.org>
Wed, 13 May 2015 08:19:30 +0000 (16:19 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 13 May 2015 21:28:16 +0000 (23:28 +0200)
Introduce invalid_phys_cpuid() to identify cpu with invalid
physical ID, then used it as replacement of the direct comparisons
with PHYS_CPUID_INVALID.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpi_processor.c
drivers/acpi/processor_core.c
include/linux/acpi.h

index 62c846b..92a5f73 100644 (file)
@@ -170,7 +170,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr)
        acpi_status status;
        int ret;
 
-       if (pr->phys_id == PHYS_CPUID_INVALID)
+       if (invalid_phys_cpuid(pr->phys_id))
                return -ENODEV;
 
        status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta);
@@ -264,7 +264,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
 
        pr->phys_id = acpi_get_phys_id(pr->handle, device_declaration,
                                        pr->acpi_id);
-       if (pr->phys_id == PHYS_CPUID_INVALID)
+       if (invalid_phys_cpuid(pr->phys_id))
                acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");
 
        pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id);
Simple merge
Simple merge