From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161620AbcFCAVP (ORCPT ); Thu, 2 Jun 2016 20:21:15 -0400 Received: from mga02.intel.com ([134.134.136.20]:21458 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753388AbcFCATu (ORCPT ); Thu, 2 Jun 2016 20:19:50 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,409,1459839600"; d="scan'208";a="979861973" Subject: [PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, jacob.jun.pan@intel.com, Dave Hansen , dave.hansen@linux.intel.com, dvhart@infradead.org, rajneesh.bhardwaj@intel.com, vishwanath.somayaji@intel.com, platform-driver-x86@vger.kernel.org From: Dave Hansen Date: Thu, 02 Jun 2016 17:19:49 -0700 References: <20160603001927.F2A7D828@viggo.jf.intel.com> In-Reply-To: <20160603001927.F2A7D828@viggo.jf.intel.com> Message-Id: <20160603001949.7D5B9534@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: Darren Hart Cc: Rajneesh Bhardwaj Cc: Vishwanath Somayaji Cc: platform-driver-x86@vger.kernel.org --- b/drivers/platform/x86/intel_pmc_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN drivers/platform/x86/intel_pmc_core.c~x86-intel-families-pmc_core drivers/platform/x86/intel_pmc_core.c --- a/drivers/platform/x86/intel_pmc_core.c~x86-intel-families-pmc_core 2016-06-02 15:19:22.437405579 -0700 +++ b/drivers/platform/x86/intel_pmc_core.c 2016-06-02 15:19:22.440405715 -0700 @@ -26,6 +26,7 @@ #include #include +#include #include #include "intel_pmc_core.h" @@ -138,10 +139,10 @@ static inline void pmc_core_dbgfs_unregi #endif /* CONFIG_DEBUG_FS */ static const struct x86_cpu_id intel_pmc_core_ids[] = { - { X86_VENDOR_INTEL, 6, 0x4e, X86_FEATURE_MWAIT, - (kernel_ulong_t)NULL}, /* Skylake CPUID Signature */ - { X86_VENDOR_INTEL, 6, 0x5e, X86_FEATURE_MWAIT, - (kernel_ulong_t)NULL}, /* Skylake CPUID Signature */ + { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_MOBILE, X86_FEATURE_MWAIT, + (kernel_ulong_t)NULL}, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT, + (kernel_ulong_t)NULL}, {} }; _