From patchwork Thu Jun 2 00:12:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Hansen X-Patchwork-Id: 9148837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8A2E600BC for ; Thu, 2 Jun 2016 00:13:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB0CC271CA for ; Thu, 2 Jun 2016 00:13:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFDDD271F1; Thu, 2 Jun 2016 00:13:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 339F7271CA for ; Thu, 2 Jun 2016 00:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752108AbcFBAMW (ORCPT ); Wed, 1 Jun 2016 20:12:22 -0400 Received: from mga11.intel.com ([192.55.52.93]:50438 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751887AbcFBAMV (ORCPT ); Wed, 1 Jun 2016 20:12:21 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 01 Jun 2016 17:12:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="819788806" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.39.121]) by orsmga003.jf.intel.com with ESMTP; 01 Jun 2016 17:12:20 -0700 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, Dave Hansen , dave.hansen@linux.intel.com, rajneesh.bhardwaj@intel.com, vishwanath.somayaji@intel.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:20 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001220.5DAB4339@viggo.jf.intel.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dave Hansen Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Cc: Rajneesh Bhardwaj Cc: Vishwanath Somayaji Cc: Darren Hart 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 #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_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}, {} };