[PATCH v4 2/5] intel_pstate: convert to use acpi_match_platform_list()

[Toshi Kani]

Convert to use acpi_match_platform_list() for the platform check.
There is no change in functionality.

Signed-off-by: Toshi Kani <toshi.k...@hpe.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruv...@linux.intel.com>
Reviewed-by: Borislav Petkov <b...@suse.de>
Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
Cc: Srinivas Pandruvada <srinivas.pandruv...@linux.intel.com>
Cc: Len Brown <l...@kernel.org>
Cc: Borislav Petkov <b...@alien8.de>
---
 drivers/cpufreq/intel_pstate.c |   64 ++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index b7fb8b7..ef22a20 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2458,39 +2458,31 @@ enum {
        PPC,
 };
 
-struct hw_vendor_info {
-       u16  valid;
-       char oem_id[ACPI_OEM_ID_SIZE];
-       char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];
-       int  oem_pwr_table;
-};
-
 /* Hardware vendor-specific info that has its own power management modes */
-static struct hw_vendor_info vendor_info[] __initdata = {
-       {1, "HP    ", "ProLiant", PSS},
-       {1, "ORACLE", "X4-2    ", PPC},
-       {1, "ORACLE", "X4-2L   ", PPC},
-       {1, "ORACLE", "X4-2B   ", PPC},
-       {1, "ORACLE", "X3-2    ", PPC},
-       {1, "ORACLE", "X3-2L   ", PPC},
-       {1, "ORACLE", "X3-2B   ", PPC},
-       {1, "ORACLE", "X4470M2 ", PPC},
-       {1, "ORACLE", "X4270M3 ", PPC},
-       {1, "ORACLE", "X4270M2 ", PPC},
-       {1, "ORACLE", "X4170M2 ", PPC},
-       {1, "ORACLE", "X4170 M3", PPC},
-       {1, "ORACLE", "X4275 M3", PPC},
-       {1, "ORACLE", "X6-2    ", PPC},
-       {1, "ORACLE", "Sudbury ", PPC},
-       {0, "", ""},
+static struct acpi_platform_list plat_info[] __initdata = {
+       {"HP    ", "ProLiant", 0, ACPI_SIG_FADT, all_versions, 0, PSS},
+       {"ORACLE", "X4-2    ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4-2L   ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4-2B   ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X3-2    ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X3-2L   ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X3-2B   ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4470M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4270M3 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4270M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4170M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4170 M3", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X4275 M3", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "X6-2    ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       {"ORACLE", "Sudbury ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+       { } /* End */
 };
 
 static bool __init intel_pstate_platform_pwr_mgmt_exists(void)
 {
-       struct acpi_table_header hdr;
-       struct hw_vendor_info *v_info;
        const struct x86_cpu_id *id;
        u64 misc_pwr;
+       int idx;
 
        id = x86_match_cpu(intel_pstate_cpu_oob_ids);
        if (id) {
@@ -2499,21 +2491,15 @@ static bool __init 
intel_pstate_platform_pwr_mgmt_exists(void)
                        return true;
        }
 
-       if (acpi_disabled ||
-           ACPI_FAILURE(acpi_get_table_header(ACPI_SIG_FADT, 0, &hdr)))
+       idx = acpi_match_platform_list(plat_info);
+       if (idx < 0)
                return false;
 
-       for (v_info = vendor_info; v_info->valid; v_info++) {
-               if (!strncmp(hdr.oem_id, v_info->oem_id, ACPI_OEM_ID_SIZE) &&
-                       !strncmp(hdr.oem_table_id, v_info->oem_table_id,
-                                               ACPI_OEM_TABLE_ID_SIZE))
-                       switch (v_info->oem_pwr_table) {
-                       case PSS:
-                               return intel_pstate_no_acpi_pss();
-                       case PPC:
-                               return intel_pstate_has_acpi_ppc() &&
-                                       (!force_load);
-                       }
+       switch (plat_info[idx].data) {
+       case PSS:
+               return intel_pstate_no_acpi_pss();
+       case PPC:
+               return intel_pstate_has_acpi_ppc() && !force_load;
        }
 
        return false;