From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754641AbcC1Fc7 (ORCPT ); Mon, 28 Mar 2016 01:32:59 -0400 Received: from mail-by2on0076.outbound.protection.outlook.com ([207.46.100.76]:64032 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754721AbcC1FcP (ORCPT ); Mon, 28 Mar 2016 01:32:15 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O4QI1K-08-Y1F-02 X-M-MSG: From: Huang Rui To: Guenter Roeck , Jean Delvare CC: , , , Borislav Petkov , Huang Rui Subject: [PATCH v5 6/6] hwmon: (fam15h_power) Add platform check function Date: Mon, 28 Mar 2016 13:32:16 +0800 Message-ID: <1459143136-2412-7-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459143136-2412-1-git-send-email-ray.huang@amd.com> References: <1459143136-2412-1-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(76176999)(48376002)(50986999)(101416001)(1096002)(33646002)(1220700001)(586003)(2906002)(50466002)(36756003)(47776003)(106466001)(4326007)(11100500001)(189998001)(53416004)(77096005)(86362001)(87936001)(105586002)(2950100001)(229853001)(81166005)(5001770100001)(50226001)(5003600100002)(5003940100001)(19580405001)(5008740100001)(92566002)(19580395003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR12MB0709;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;MX:1;A:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: 248d506e-6bf7-433f-eacd-08d356ca500d X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;2:UfGzYmgvHk2AhbYS6ANvyhoMQos2urQMpaENqujWWmnUGJ/h46UvUxEbGOM8doWdm0v9cQaPUs5MXmiPd7aT7GKojSJgqzIQbL4q2pBxSErUjGmZT0HDSHBvHjPeshwPaRQLl98Zt+JJ6/P6wSKnkl+uax+3PCDImrYXUyPVN8iY58KKQCHnrqtDJeNtbTHG;3:DtRzYyNlIUuEw28FsRFTcxu1sWCPASiwhcevsra21wYgPUMi/8uoUf1LJdnjajENNmoYZcBdQu9xcaZG3mPVR/gYZoQ8H2QFVPt6xf7o2l+YgQRtF2TcfiPr7npWjJdsTfPndQdrQd7D2mBOuuGdDiZ3NmhLBBpGbEze5SiWCk8eU8D6zMk20UwtbMUwcigAQuvfbdHs8DIs1HjmisRQ+tOP3g2IUzpbjdnwGBA0Ebc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0709; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;25:jP79fflHqUrXmIHgYb+v5h4r10GimqXXuqgvzU7ZmggiDeD1gfyqYWkYAmQeldQQRtxOPohEhq7ys8CWlLpC5VqDR/byhjtdYjsZJZsFB0W15mQSnuSkOIwXTA7Xthr4slMLYKfO9l4TXYjs44vZsmL7xGgtASLFvaVAXCtYAXDrWzP0Q10asTA6i7c+UVJQyfQp5BvQ5H8KD6jvcuyjBvfMRg/kZFoGr0ykq68V1IIpiHj/94oplFr1IquLuQQ0xmqwARfqWUK+6OzIebX9FMkpVzUF526YxIcn+enZ+IW7wenKqmsnLppTr0Po0vo06Ugp9XEMgX3TXKYVLa2VRf77qPc0w8cIjgFqmq+9mpkEIRhJXhq+8OGcFc3EZzvWOMg4aMmOAUeaZ9BafJyl/xSBtxqVRhiePW+Trbf577dvpITiknyXPpYY2sMq7zjBWSzl/9IApxupbHSCU1vqvTDWvY3DZPXcPTR1omSyhtskrOErf6XXBks7IIPhmMFG4ODMi2aXw6LBTK8nAfYOkCQfHhSlHbNwwWQf77H9W0Y= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;20:YQt5UqwiINtexCKDDfKgSJfqvcoZqz4yn11pYfS88O3JC6MJWqE+s7nVljsC+wI9QUTi17CPK9Iu+qq1zXJiwfSNxI5T8tiy7nkAkd1KiD3/ih8kQHlBcpsc3grvhe68RU3OPKZDukS2/+kXDwyVJZrfDv7WdHNVmDVFhfEArPWUmav2IaY/zNCZ3Yv51Q79Iui8KgovDXj+pypOFJFAj8YWfwesI6tbU15L3360M5QtaV3EUNoVSOdx2tfRY7LXYBkCP6vcrPBAb7g4cZZTCfzlEgXPaNcTmXsd0AWvw4aeq+SmmZdHiQTEclJUpHz68aA9W2kNaVPuT6/dUCwj0q9gUkp5L4zyI/bO7L3Ov+H315VNkcYJlFJ9clCaM2ifjdRqySm1egqCC5vWhqOWIBxG1qSW730YtaU1+dAff5/dqf4nmGMbJBcDMZgPnI4U6aAbo/3OUw+CBVz2Laozyss4Wek6qIGLaJSOtw6d9fv0TE4PgLLQE8Rd53WfzG/u X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13017025)(13023025)(13024025)(13018025)(13015025)(8121501046)(5005006)(3002001)(10201501046);SRVR:BY2PR12MB0709;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0709; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;4:mhx+cwUz/owZ+uLc639xUc0XhuG3P3tbs9pVJB64yr5OghBax2chc3/3jjT8atdSdJqga4Q+90fLMVif3OCcRvZgXsHzp1ed5sHuqZjq8wOAYuqv65FRdxWYdOw7E+y4sv2iJwb8fuNjhLt/y0XsbAXTsI2rFiPlDxp4so2Qz6HdHAkDx9gXi0Gr30zIs2Ipb40NhDeDEiHIE6hB+VQzMIaw/Zsf+uuLdGxDXCS+GiZFq/aDuJTwA1P1KkHqLuuTCSV8kOIhdxjhBneqE5+H1xfWDUgthVJgv6jV3QXKQ+TqwHKVLS/4kvMENhdqo3e6UpROB0obisddjwEFB+ohmwuwY4rMU76+lpUPz3Mml9RHvScUhhTSB151qIq0ymOk6bvQDEs6ARTNyYD6qDQ2UXRX3JdCxei43281Qkf37GYNkZ6lmdZH0+BthlPfAVTUIYZWA3IyPols7Zy8aXzmIw== X-Forefront-PRVS: 0895DF8FFD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR12MB0709;23:+9u34v5xjxo7KvI8l5k6B2+lnbDJUYRAtbOO2J2Tm?= =?us-ascii?Q?gwjZEJuaTbRRIh2wb47l/UU2eXTnD98VvZrOpmhmKFc8eARkyanjGIGg8JwB?= =?us-ascii?Q?QoU0+zGrF9dV5gjsDOcqhbLXcbsJOpOtIQcYAJgbLLS9sPq2psYikIrRbI+m?= =?us-ascii?Q?WZAHwdEUWSTT9pBE9Op4Vv6z0WxxzdOtgnFpi0pA5hSsp+Br8r7rqQ4scB33?= =?us-ascii?Q?EdLGNFAHju/8EVXNh1FoNDbtj+q0BoJ1jV1gAQHXEnHGaoPMSHymtinLhDSG?= =?us-ascii?Q?HpbbpxRbdLO7IxXwOmUeLIlfKyWcTvH0popA05aAVZ9rGsM3MERIGRGvLtnk?= =?us-ascii?Q?lPFIkT5qjl6Wez0nKaZkGwet0373IhMpSKcyibt0LQ2HJqheP77U2q3q8x3F?= =?us-ascii?Q?FjMxD4G+zLnVLPPJTd9BbR1PImWFc22MjRoxuOw7pa0djUWNXgh1tNpMmp3M?= =?us-ascii?Q?mRvTtYuz8krgP6jneHc3n5+Gd8zy41foBuQPdyk47daRPLwv891JORslYGvE?= =?us-ascii?Q?P8I+dLN9A4s/UPw0rk2OyqVRR/Po0H//lyxy5EdCnrqeIR2Xxclbgelj8mYi?= =?us-ascii?Q?Ii1r9FCYzeGjOFKV8i2JKhFJtcBQInUmsstzIfJVN2zv6eaRrzfVqS1xH+ek?= =?us-ascii?Q?MPtSRlGsoyna65Y6UzrYkCGEyx9xihpwRhcz/FFyAFl2ayLR0Wm1Q/yrbAKt?= =?us-ascii?Q?buQj7nineXgX3ApazyjQTCQCgBRumZkzK439e3m7uEE7XQffGVMrfJEDxT/n?= =?us-ascii?Q?96HUnF+YV7f+PEEMGdoZxAt5yZTgEc3TMmDXOpoknCT9JsxV2+pmT7vOGCSh?= =?us-ascii?Q?FN/U/nItn33ScF08NFj1XOlVkesM+BEf2RnypvzL6guCKhePIb46vQaBp3Ju?= =?us-ascii?Q?qG+5hjfFkUUI3WFrrITlV0oV91tZDpVLpOrTsKX+GeeltPsPwmvNl64L27Sb?= =?us-ascii?Q?UExfn7ygwOxxZYoonNKjtpEcBoWTrD5Bz8D5ZnFj4GSnqfYiiNzIme4D3JL+?= =?us-ascii?Q?mp84uyTImOcfVOccE/2FHSR?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0709;5:8aeYvGgjdcqnlKraj+9lIcoYS10fs01gkd3H49RaZJtqRYp9WwfSfA+6LUjiQ1FCEeuFJMzBbJMELSYv5d+NvlXvkPBwgydEmxpehGyc2Q4JtwDVDTSATjIVBHOVSMrMRcrNyERTi/xO7unvpr4OYw==;24:cTpwkZ7aA0L8nWwDQpBcuy4UkPTJ2Z+b9eYc+SRQZ6SHWp/6kEScu9vj8MyocWD2FxQS4nCfSyX1IuEXLH2WvUMJNrBJMgVvAHZPfX8cOWk=;20:PGMH+e361FICzhjYjoqiQJAUz+VjJk/iy+QA9ENhvXyuChLQ+ljNqZQP215E+XQ1zJLddtqX92k68Bpc4aLbrWuJGGcxD3zVDxUG7kKHebDzhgG3ylDVMviC2JSMn6sGiOaprzDcS1oS7Ky6t0QhgcUFouz5v4xL8eD2e1Qc9P6pqrHXsg8FYUIoOxfN9jEX2gH4Hd/29UnoM14n7FlTQupCKQDKPfBSxd0FQ1RcDtkSBJbrS2oX6kFArP8sAcxa SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2016 05:32:11.1468 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0709 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds a platform check function to make code more readable. Signed-off-by: Huang Rui --- drivers/hwmon/fam15h_power.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index c1cad26..622c646 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -78,6 +78,11 @@ struct fam15h_power_data { unsigned long power_period; }; +static bool is_carrizo_or_later(void) +{ + return boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60; +} + static ssize_t show_power(struct device *dev, struct device_attribute *attr, char *buf) { @@ -94,7 +99,7 @@ static ssize_t show_power(struct device *dev, * On Carrizo and later platforms, TdpRunAvgAccCap bit field * is extended to 4:31 from 4:25. */ - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { + if (is_carrizo_or_later()) { running_avg_capture = val >> 4; running_avg_capture = sign_extend32(running_avg_capture, 27); } else { @@ -111,7 +116,7 @@ static ssize_t show_power(struct device *dev, * On Carrizo and later platforms, ApmTdpLimit bit field * is extended to 16:31 from 16:28. */ - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) + if (is_carrizo_or_later()) tdp_limit = val >> 16; else tdp_limit = (val >> 16) & 0x1fff; -- 1.9.1