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

Commit bd185231 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Borislav Petkov
Browse files

EDAC: Get rid of custom ICPU() macro 



Replace custom grown macro with generic INTEL_CPU_FAM6() one.

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20180831082341.72363-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 8960de4a

drivers/edac/sb_edac.c

+7 −10
Original line number Diff line number Diff line
@@ -3320,17 +3320,14 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) 
	return rc;

}



#define ICPU(model, table) \

	{ X86_VENDOR_INTEL, 6, model, 0, (unsigned long)&table }



static const struct x86_cpu_id sbridge_cpuids[] = {

	ICPU(INTEL_FAM6_SANDYBRIDGE_X,	  pci_dev_descr_sbridge_table),

	ICPU(INTEL_FAM6_IVYBRIDGE_X,	  pci_dev_descr_ibridge_table),

	ICPU(INTEL_FAM6_HASWELL_X,	  pci_dev_descr_haswell_table),

	ICPU(INTEL_FAM6_BROADWELL_X,	  pci_dev_descr_broadwell_table),

	ICPU(INTEL_FAM6_BROADWELL_XEON_D, pci_dev_descr_broadwell_table),

	ICPU(INTEL_FAM6_XEON_PHI_KNL,	  pci_dev_descr_knl_table),

	ICPU(INTEL_FAM6_XEON_PHI_KNM,	  pci_dev_descr_knl_table),

	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_XEON_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),

	{ }

};

MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);