From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425763AbcFHOSC (ORCPT ); Wed, 8 Jun 2016 10:18:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33810 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422831AbcFHOSA (ORCPT ); Wed, 8 Jun 2016 10:18:00 -0400 Date: Wed, 8 Jun 2016 07:16:27 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: brgerst@gmail.com, dave@sr71.net, bp@alien8.de, peterz@infradead.org, torvalds@linux-foundation.org, dvhart@infradead.org, dave.hansen@linux.intel.com, tglx@linutronix.de, luto@amacapital.net, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dvlasenk@redhat.com, souvik.k.chakravarty@intel.com Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dvlasenk@redhat.com, souvik.k.chakravarty@intel.com, brgerst@gmail.com, dave@sr71.net, dave.hansen@linux.intel.com, dvhart@infradead.org, torvalds@linux-foundation.org, peterz@infradead.org, bp@alien8.de, luto@amacapital.net, tglx@linutronix.de In-Reply-To: <20160603001947.05102C3E@viggo.jf.intel.com> References: <20160603001947.05102C3E@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/intel_telemetry: Use Intel family name macros for telemetry driver Git-Commit-ID: 678dec00a4753b74df8ad6fc5167429b614d1139 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 678dec00a4753b74df8ad6fc5167429b614d1139 Gitweb: http://git.kernel.org/tip/678dec00a4753b74df8ad6fc5167429b614d1139 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:47 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:26 +0200 x86/intel_telemetry: Use Intel family name macros for telemetry driver Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Acked-by: Darren Hart Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Souvik Kumar Chakravarty Cc: Thomas Gleixner Cc: jacob.jun.pan@intel.com Cc: platform-driver-x86@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001947.05102C3E@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- drivers/platform/x86/intel_telemetry_debugfs.c | 3 ++- drivers/platform/x86/intel_telemetry_pltdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index f5134ac..815a7c5 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -331,7 +332,7 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = { }; static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { - TELEM_DEBUGFS_CPU(0x5c, telem_apl_debugfs_conf), + TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf), {} }; diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel_telemetry_pltdrv.c index 09c84a2..6d884f7 100644 --- a/drivers/platform/x86/intel_telemetry_pltdrv.c +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -163,7 +164,7 @@ static struct telemetry_plt_config telem_apl_config = { }; static const struct x86_cpu_id telemetry_cpu_ids[] = { - TELEM_CPU(0x5c, telem_apl_config), + TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_config), {} };