EDAC: Convert to new X86 CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200320131509.673579000@linutronix.de

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 9fbad908a854810ab716bc98a00da83ba6e041bb..f91f3bc1e0b28b1095977ce3b27621e6fc08616f 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3626,13 +3626,13 @@ static void setup_pci_device(void)
 }
 
 static const struct x86_cpu_id amd64_cpuids[] = {
-       { X86_VENDOR_AMD, 0xF,  X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_AMD, 0x10, X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_AMD, 0x15, X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_AMD, 0x16, X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_AMD, 0x17, X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_HYGON, 0x18, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },
-       { X86_VENDOR_AMD, 0x19, X86_MODEL_ANY,  X86_FEATURE_ANY, 0 },
+       X86_MATCH_VENDOR_FAM(AMD,       0x0F, NULL),
+       X86_MATCH_VENDOR_FAM(AMD,       0x10, NULL),
+       X86_MATCH_VENDOR_FAM(AMD,       0x15, NULL),
+       X86_MATCH_VENDOR_FAM(AMD,       0x16, NULL),
+       X86_MATCH_VENDOR_FAM(AMD,       0x17, NULL),
+       X86_MATCH_VENDOR_FAM(HYGON,     0x18, NULL),
+       X86_MATCH_VENDOR_FAM(AMD,       0x19, NULL),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);

diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c
index 059eccf0582bbbe80b62d2bc7875b4f1c74f40cb..df08de963d1017607de5df515108e445bf3cd79e 100644 (file)
--- a/drivers/edac/i10nm_base.c
+++ b/drivers/edac/i10nm_base.c
@@ -123,10 +123,10 @@ static int i10nm_get_all_munits(void)
 }
 
 static const struct x86_cpu_id i10nm_cpuids[] = {
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_TREMONT_D, 0, 0 },
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_ICELAKE_X, 0, 0 },
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_ICELAKE_D, 0, 0 },
-       { }
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,      NULL),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,           NULL),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,           NULL),
+       {}
 };
 MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);
 

diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index 933f7722b893d7e516854c1b779d09970653bb94..bc47328eb48588314a257a499e71d2d88f2ff412 100644 (file)
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -1537,8 +1537,8 @@ static struct dunit_ops dnv_ops = {
 };
 
 static const struct x86_cpu_id pnd2_cpuids[] = {
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_GOLDMONT, 0, (kernel_ulong_t)&apl_ops },
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_GOLDMONT_D, 0, (kernel_ulong_t)&dnv_ops },
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,       &apl_ops),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D,     &dnv_ops),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, pnd2_cpuids);

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 4957e8ee1879920f2139e3c2318dd4772b3d5280..7d51c82be62ba3cf9d379c53c67ee7b4caa53f08 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -3420,13 +3420,13 @@ fail0:
 }
 
 static const struct x86_cpu_id sbridge_cpuids[] = {
-       INTEL_CPU_FAM6(SANDYBRIDGE_X,     pci_dev_descr_sbridge_table),
-       INTEL_CPU_FAM6(IVYBRIDGE_X,       pci_dev_descr_ibridge_table),
-       INTEL_CPU_FAM6(HASWELL_X,         pci_dev_descr_haswell_table),
-       INTEL_CPU_FAM6(BROADWELL_X,       pci_dev_descr_broadwell_table),
-       INTEL_CPU_FAM6(BROADWELL_D,       pci_dev_descr_broadwell_table),
-       INTEL_CPU_FAM6(XEON_PHI_KNL,      pci_dev_descr_knl_table),
-       INTEL_CPU_FAM6(XEON_PHI_KNM,      pci_dev_descr_knl_table),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &pci_dev_descr_sbridge_table),
+       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,   &pci_dev_descr_ibridge_table),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,     &pci_dev_descr_haswell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,   &pci_dev_descr_broadwell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,   &pci_dev_descr_broadwell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,  &pci_dev_descr_knl_table),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,  &pci_dev_descr_knl_table),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);

diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c
index 83545b4facb7693696d49ecafd8ccbf39cd67d42..46a3a3440f5e7f1225b161ca38fc9bb5728d8e6c 100644 (file)
--- a/drivers/edac/skx_base.c
+++ b/drivers/edac/skx_base.c
@@ -158,7 +158,7 @@ fail:
 }
 
 static const struct x86_cpu_id skx_cpuids[] = {
-       { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_X, 0, 0 },
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,   NULL),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, skx_cpuids);