From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161351AbcFCATs (ORCPT ); Thu, 2 Jun 2016 20:19:48 -0400 Received: from mga11.intel.com ([192.55.52.93]:55917 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161278AbcFCATo (ORCPT ); Thu, 2 Jun 2016 20:19:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,409,1459839600"; d="scan'208";a="820618115" Subject: [PATCH 12/20] x86, edac: use Intel family name macros for edac driver To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, jacob.jun.pan@intel.com, Dave Hansen , dave.hansen@linux.intel.com, tony.luck@intel.com, mchehab@osg.samsung.com, dougthompson@xmission.com, bp@alien8.de, linux-edac@vger.kernel.org From: Dave Hansen Date: Thu, 02 Jun 2016 17:19:43 -0700 References: <20160603001927.F2A7D828@viggo.jf.intel.com> In-Reply-To: <20160603001927.F2A7D828@viggo.jf.intel.com> Message-Id: <20160603001943.948C3F37@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Acked-by: Tony Luck Cc: Mauro Carvalho Chehab Cc: Doug Thompson Cc: Borislav Petkov Cc: linux-edac@vger.kernel.org --- b/drivers/edac/sb_edac.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff -puN drivers/edac/sb_edac.c~x86-intel-familites-edac drivers/edac/sb_edac.c --- a/drivers/edac/sb_edac.c~x86-intel-familites-edac 2016-06-02 15:19:20.706326789 -0700 +++ b/drivers/edac/sb_edac.c 2016-06-02 15:19:20.721327472 -0700 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -3359,11 +3360,11 @@ fail0: /* Order here must match "enum type" */ static const struct x86_cpu_id sbridge_cpuids[] = { - ICPU(0x2d, pci_dev_descr_sbridge_table), /* SANDY_BRIDGE */ - ICPU(0x3e, pci_dev_descr_ibridge_table), /* IVY_BRIDGE */ - ICPU(0x3f, pci_dev_descr_haswell_table), /* HASWELL */ - ICPU(0x4f, pci_dev_descr_broadwell_table), /* BROADWELL */ - ICPU(0x57, pci_dev_descr_knl_table), /* KNIGHTS_LANDING */ + 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_XEON_PHI_KNL, pci_dev_descr_knl_table), { } }; MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids); _