[PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver

From	Dave Hansen <dave@sr71.net>
Newsgroups	linux.kernel
Subject	[PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver
Date	2016-06-02 02:20 +0200
Message-ID	<rFowG-7d9-23@gated-at.bofh.it> (permalink)
References	<rFowF-7d9-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Dave Hansen <dave.hansen@linux.intel.com>

Another straightforward replacement of magic numbers.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Cc: Vishwanath Somayaji <vishwanath.somayaji@intel.com>
Cc: Darren Hart <dvhart@infradead.org>
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-01 15:45:09.410182530 -0700
+++ b/drivers/platform/x86/intel_pmc_core.c	2016-06-01 15:45:09.413182667 -0700
@@ -26,6 +26,7 @@
 #include <linux/seq_file.h>
 
 #include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
 #include <asm/pmc_core.h>
 
 #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_MODEL_SKYLAKE_MOBILE, X86_FEATURE_MWAIT,
+		(kernel_ulong_t)NULL},
+	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT,
+		(kernel_ulong_t)NULL},
 	{}
 };
 
_

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver Dave Hansen <dave@sr71.net> - 2016-06-02 02:20 +0200

csiph-web