From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933798AbcCKCSZ (ORCPT ); Thu, 10 Mar 2016 21:18:25 -0500 Received: from mail-by2on0075.outbound.protection.outlook.com ([207.46.100.75]:3946 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933644AbcCKCRw (ORCPT ); Thu, 10 Mar 2016 21:17:52 -0500 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: 0O3URPH-08-GLG-02 X-M-MSG: From: Huang Rui To: Guenter Roeck , Jean Delvare CC: , , , Aravind Gopalakrishnan , Borislav Petkov , Huang Rui Subject: [PATCH v4 6/6] hwmon: (fam15h_power) Add platform check function Date: Fri, 11 Mar 2016 10:17:50 +0800 Message-ID: <1457662670-3354-7-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457662670-3354-1-git-send-email-ray.huang@amd.com> References: <1457662670-3354-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;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(5003600100002)(5001770100001)(92566002)(5003940100001)(189998001)(36756003)(1220700001)(19580395003)(19580405001)(1096002)(48376002)(5008740100001)(11100500001)(87936001)(4326007)(81166005)(76176999)(2906002)(229853001)(575784001)(86362001)(77096005)(53416004)(106466001)(50466002)(33646002)(105586002)(50226001)(2950100001)(50986999)(586003)(47776003)(101416001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN4PR12MB0851;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;MX:1;A:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: 4eb02a12-426a-4d37-d87a-08d349535710 X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;2:bBvymQdfiIRPuiNnDgaKaqJahBmf3u0tk2yYRHIxJAhaPaTaxKYfME72EdOfytm339Cql68B6oLeDamOdFGto4YL9ZPr7SGVoQ0OgrPNImBctymP57MZ3TyX3psannwx6m+FRLw8+A8tP2mLISi5AsLLT0ZuHpKLZJF8BMqms7/S8jYSfgWqx7oCuKrv1tXL;3:g/15lv0oWztkvDIKyhiSYzMLITfgLX9owD4nP2NOA0l7YPBwvnuNtnGO+VxUCOhggK3gQ238ilST8yVeNfv0CSGlggIOVVfZNwbBCOwn2I0NRZhJwXVEFBe5HzCcsd+Vq1j7PV2e8bL3gy6OjHKtbhJ1jCptFyPCxgeGLJB6enU6WMQDT/jNSbkAarEVyKQbMGvafM/CLnABTE84UKYtuTILmCfBcbsri/bH5QqnaDE=;25:gVH+4y4NQ+kb8qtN0Zm3CMrOmEPfnHE1ebayb1fN4JV8YCKLK0jevMk4dKGxXorRMA+R+7URyCaf5KgfS8iEfRfffJq8mmmNuCDBB6A1vRrCT617Unvh2GQaMAoIOApgmYdiiv7KebplaVnqpTBmLxQqesupuS4PfLwtfAV/GGsq6gYT8sehfILvisFoMnCX6LCZvk3Awj4T/t1coPYjGa3le+3nXABWwd7kl4HAbmxkJ56zi5BargL0YHrg9vvt+PjPQggJ2Cev5UkE+gyD3RLUTJoXU4jvqyi4nUSiJ2s2Ng2Tslu5aLY7PklkGOlkCOdb7hDT/pc6t45bl14qc3X4spnFvrlpZhbthlLv6riJTZBwU3XcvBZhXNH7HaxjuQ11w4AWbTfwpyJo3Scs8w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR12MB0851; X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;20:ghd6T5AOeXdW/HwUdXCK+QO/n30sgde9t5bJVTUIOyH42+9JPRJCFvcbgYmSDmEGLCUSH+5OgMF2fJOZeetH359Pd1YLy+2YeLL8ic3nLr7jff/BqiFTRKP14UWqfsA6gt2BHoJ00/0OChkm+21A0QJiC8sJl7MI7vG7jR/bN0WofbC3DzzDCkYTvRSnBE6LyFnsySArXGhmgHkXHdITd5CXAzQ7fSBHTnIiyqS7vtOZfDHZcNXau0VowV9aMaka+BQm+sr1weXg1yT2fX7FM7z2fQ3FiFlTH9kkQPcQB2KQhK1Fcw0bdJQAqrAlgEQbZlr5eGZgP5/rxxs/mGfHEb9Qpne3ibIJCgRqbfxU7FA92WZYw1ILJb3K15vRcv09IPPMY9cdLyx0//rVnSqvi1ysEbsjK3o9tAq0Q+3N3VSD40xB5hZrTYJ2vebC68O8anR02dYfGoy+wWqGAHwEva0p1mQ/wpDXSN7b7wjSkeaXqfCpE1QAlg1hjVTtaOuG X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13024025)(5005006)(13023025)(8121501046)(13017025)(13018025)(13015025)(10201501046)(3002001);SRVR:BN4PR12MB0851;BCL:0;PCL:0;RULEID:;SRVR:BN4PR12MB0851; X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;4:j422nwaYHi0AI6IG6u5ybcWzDYw5OFJqiLIqlF02/tiNYB+Xex1JMxXzIo71dBTUMk8GQStv8sboMqSlHR01CtMMbHBe/Lo2Zg79gozyCloKwmlE6jKs/HEL9vkoTTfF7CwxC4Cd4AAi26g3ZC5yDpiuT0D6CcjdQKAQpuaXkk7DSpvN9J9MBxvl85LcZ6wEM9UzsZpcwrsYUP+92SJRzOlsbUv6KTt3zlAPnUvCiBnauDAgKFU/nBDAel1WY1D3IdN6UcN2XCXbvzL/sYkfFGK1TIrGib6xELZjSHVzqAxanxAOfYQETzXk1dP3JoKeWeGTZooQKnulDAm17dtpcNO++/5rgDrZnrtN2a07asuo6fIDx65o3PKf8j1wiXXPSIQ9z20yUWxoJ50s0TY5ZnQy3Fh5ys57eUk2M+u7PnDPdkzKaZfOmDkwG86VE7/Fyhltyv6f8ANg3PSBa29mSA== X-Forefront-PRVS: 087894CD3C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN4PR12MB0851;23:dBUAafg3xrcxn1cDYYWHpS/mgBSM7Hgh+D35FdgbF?= =?us-ascii?Q?/Ttk0XFoj1XXDzq+PL9DtYop/RXljSP03I2fXNtl3fTjl01xNN8aVIKBr2Si?= =?us-ascii?Q?zv03t1mqK4SfBBqrCbXOdqoZqOEU4lc5PS7xOqmkvzQ9nCneibSw/mYp2TKW?= =?us-ascii?Q?mHRem3PItRi1MyUsXCgIlDVy/sydpQ3sUZvCS0LTNscgZ9OY7m31GnUJj/Cs?= =?us-ascii?Q?nGf0GcdyMDfIOHzub3lw46bkmE5YFWT5wB5w2ZCcwyZ/5PMhMO0bSbB1AIp1?= =?us-ascii?Q?Zs6iCO8sEnkqLURT0t7b8QywJYaFUWQMcblXy7iu5gHk5tMegMC9wA0FYlAs?= =?us-ascii?Q?CN68sbFHOMI/Gx0Rnfw/i3de/ffNEvEVxorWWH3ZLVNY296FN4JuXEaZt5iV?= =?us-ascii?Q?D3RZeSrDeiGg9N6Y5AmhvOG8183zoTwY0p9C7xmrgTFe+16UdIPJi5Z0Y8zU?= =?us-ascii?Q?iD7qgT0iwj+CrdtUnsrbIBUA8EOJDZ4DoTVO2K8CFK1zijAUz9ZQCdDlByGQ?= =?us-ascii?Q?eIxlNLa05Twh/i5dnLs41JuNnpsL5yNOo5MeCOo02FuwZE8WIVdlqILhTMSV?= =?us-ascii?Q?gjyczq3wOYS34+9UqhuKplRFTkykbZhGmqtNkWxvSo4niQtyKyKYgQKdJVqK?= =?us-ascii?Q?JSDxaTyzMgcUiwe7qWAmsL0PC3b7LHeDgL8yoF9KFL97pXDp+LbGGpnVjzdr?= =?us-ascii?Q?wZwq5xU9k0PU4iBVjCOi2Y4O+CvgRwkhGojGPM5spfwq7Ft1WStArN+gaxDf?= =?us-ascii?Q?4NO+ruHfAzBBvZ94rruffwCGMXPNVuGM7RtTGoctZqkTh7cpuYveo+cqZO7u?= =?us-ascii?Q?GzqWkAuGbbCvsFhC2/jP0FijhVQHbgb6Yp1jZ4iEdFftbLjwaaBmvDl23tPS?= =?us-ascii?Q?uwJkfHyxSfF6kydeKSytHT2NCmjUZml1w0gjX6NONrAScMyMPA5BXi8MrPpo?= =?us-ascii?Q?GuLIyWfI7mk2nV5kKfifYRYKmxhh574SbBIbXuC7da0mQZJkHUF1ZytGV9LF?= =?us-ascii?Q?Vo9UJpytasML0W+fWMeLzdWmWF//GBF1Ja7VxEty4HxJQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN4PR12MB0851;5:TR+AOycqxMqtVK8Js1MFexum0hyR/2r0Hr5pfs+zHftqvI+DMtrcIxzVw3Oy8RTlgBWNooSOmPcPm/KdeMn8rhcIjv4/dwYZO+P+UJseaFilwL0ISFMoCTEb3EFZuGNQAParXNu4WbwZ6ZX3dZC6sA==;24:r9b70gnEhao6KW1eDA4RXsJfxpVriFziiXAMSExnG0ERMBY6x/duqgJ1C5BCSoiUDJGKvq8g3vHbMxY1VYXEgvdd0pmbRrWTS4Xa5RR0mAQ=;20:R7ZwRh7LH7uwK5IuWdRrMlILMx3fAJij1QVEMLIbXdygk7InjanX32KJkomjLcXoCZaQdxdlJvDDqYcThgxjxlgpjWaibAcWH7iLNS9E79wehRIZxA83MoEoK291g0mnKVGpfhamM4H441eVlvVkkLClWpG6k+Pj0n83Hs/27ectIVDukJV0QFStNGhAvLclUnMUJrNz/Cmy1sG1EXNOFBDpw0zdi4cb75p24BxBQNohkG88z2i6nMoUaFgnEj0o SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2016 02:17:45.9622 (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: BN4PR12MB0851 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 35800cd..a0bea56 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