From patchwork Thu Jun 2 00:12:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Hansen X-Patchwork-Id: 9148845 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 45337600BC for ; Thu, 2 Jun 2016 00:14:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 375BD271CA for ; Thu, 2 Jun 2016 00:14:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C62A271F1; Thu, 2 Jun 2016 00:14:11 +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=unavailable 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 D86EF271CA for ; Thu, 2 Jun 2016 00:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbcFBANz (ORCPT ); Wed, 1 Jun 2016 20:13:55 -0400 Received: from mga01.intel.com ([192.55.52.88]:56922 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbcFBAMT (ORCPT ); Wed, 1 Jun 2016 20:12:19 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 01 Jun 2016 17:12:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="967069515" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.39.121]) by orsmga001.jf.intel.com with ESMTP; 01 Jun 2016 17:12:18 -0700 Subject: [PATCH 15/20] x86, intel_telemetry: use Intel family name macros for telemetry driver To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, souvik.k.chakravarty@intel.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:18 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001218.D3434548@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: Souvik Kumar Chakravarty Cc: Darren Hart Cc: platform-driver-x86@vger.kernel.org --- b/drivers/platform/x86/intel_telemetry_debugfs.c | 3 ++- b/drivers/platform/x86/intel_telemetry_pltdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/platform/x86/intel_telemetry_debugfs.c~x86-intel-families-telemetry drivers/platform/x86/intel_telemetry_debugfs.c --- a/drivers/platform/x86/intel_telemetry_debugfs.c~x86-intel-families-telemetry 2016-06-01 15:45:08.962162099 -0700 +++ b/drivers/platform/x86/intel_telemetry_debugfs.c 2016-06-01 15:45:08.967162327 -0700 @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -331,7 +332,7 @@ static struct telemetry_debugfs_conf tel }; static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { - TELEM_DEBUGFS_CPU(0x5c, telem_apl_debugfs_conf), + TELEM_DEBUGFS_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, telem_apl_debugfs_conf), {} }; diff -puN drivers/platform/x86/intel_telemetry_pltdrv.c~x86-intel-families-telemetry drivers/platform/x86/intel_telemetry_pltdrv.c --- a/drivers/platform/x86/intel_telemetry_pltdrv.c~x86-intel-families-telemetry 2016-06-01 15:45:08.964162191 -0700 +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c 2016-06-01 15:45:08.968162373 -0700 @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -163,7 +164,7 @@ static struct telemetry_plt_config telem }; static const struct x86_cpu_id telemetry_cpu_ids[] = { - TELEM_CPU(0x5c, telem_apl_config), + TELEM_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, telem_apl_config), {} };