Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4756915pxu; Thu, 10 Dec 2020 04:55:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZQ3nFbw0xh1s+XeE+kkOg7a+YCkEIwQwD7SFsH9rTtVEqTr/iel0SqdiKnObCW/ZDGfbI X-Received: by 2002:a17:906:1b46:: with SMTP id p6mr6368507ejg.68.1607604930601; Thu, 10 Dec 2020 04:55:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607604930; cv=none; d=google.com; s=arc-20160816; b=j9LOV9a5Ke2qdhlDXb9ww4nPnegoz6aZra0fOub1+WXE1GS9jHMLsU01K5p3TV6dNE /NaKgMDs+gBBuBL8qYaPWHpjiIxZ1B0ZukPGE1FdiUbIHdX0DLIXVN782W9UUMGep9Bl l/p9FUVtLVREEyLjoLAPfAw1b7CboslbuzZeORNPS3poCflkFYbKOYn6NVHiqyzR+v3X 6pXBkhUGzuA8wbgZm2L7drWQ3S18pYjrID7IpywZRKLvMBd2EaDY6KwfgqRS+unxxqp8 1ulKRHxQA2auawRFUhvM1AvqYt7yOHHdHduIwaRpg8TBnDUR+AF6NSfD5//RRAnMsuUj yxtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=f98qCGt2WzvXyasFPSFMWPes8Jy9Cq2Yyf/NVlHWI8s=; b=YBZ7CEL4qKmWuf0M9Ugmfug55s2vJy3UwcSN+gFgbyUOcf/yVXvl1c0RkEQ4mAKZWQ YyMTyWGSaZI5iSnFAWMTrE1h0dhwJ2M+maQIEGzXRDRxeHxiF1KrhDmVEYOs1UhD8/24 WLTrXygLjqmQWG3OtQi862f92wIK9xVOzIq5vFxMWRtfy5p2CCFluUqF4SImN0NKLRqu 4+15uDVEVv4vKWryIisTKWKYOZo8kd1cGjom1lrGVT0ia9hoDdZypv+6yBX64YK2KYg2 gOd5lgd5xUWZ+75+BGgnTUgDC9Hxfo8c85jt9vj1nVwSOHkWm4jxlLtSBMZrJqtGa7kl i7sQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d10si2814446edk.240.2020.12.10.04.55.07; Thu, 10 Dec 2020 04:55:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388184AbgLJMwU (ORCPT + 99 others); Thu, 10 Dec 2020 07:52:20 -0500 Received: from mga12.intel.com ([192.55.52.136]:26357 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387545AbgLJMwG (ORCPT ); Thu, 10 Dec 2020 07:52:06 -0500 IronPort-SDR: ljOmEhNXsfUB3Zd1xATnE958FSX1P6Fu5GRQFIT8TBciH40UYVCYhRPTjfjCSDBPqPxSly2EZP GJ70g56q5V2A== X-IronPort-AV: E=McAfee;i="6000,8403,9830"; a="153481136" X-IronPort-AV: E=Sophos;i="5.78,408,1599548400"; d="scan'208";a="153481136" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2020 04:51:21 -0800 IronPort-SDR: zMhGeLDLV+I+Gs/yc8yu1CBaVblxWNO+V1vRFf/q1wFfUjFttEWzHWAJI/PDqRUitkAgGS+SqR LkTVDiHHsZIA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,408,1599548400"; d="scan'208";a="408517044" Received: from srpawnik-nuc8i7beh.iind.intel.com ([10.223.107.144]) by orsmga001.jf.intel.com with ESMTP; 10 Dec 2020 04:51:19 -0800 From: Sumeet Pawnikar To: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: andriy.shevchenko@intel.com, rui.zhang@intel.com, sumeet.r.pawnikar@intel.com Subject: [PATCH -next] thermal: intel: pch: use macro for temperature calculation Date: Thu, 10 Dec 2020 18:18:01 +0530 Message-Id: <20201210124801.13850-1-sumeet.r.pawnikar@intel.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use macro for temperature calculation Signed-off-by: Sumeet Pawnikar Reviewed-by: Andy Shevchenko Reviewed-by: Zhang Rui --- drivers/thermal/intel/intel_pch_thermal.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c index d7c05c00881e..41723c6c6c0c 100644 --- a/drivers/thermal/intel/intel_pch_thermal.c +++ b/drivers/thermal/intel/intel_pch_thermal.c @@ -167,8 +167,7 @@ static int pch_wpt_init(struct pch_thermal_device *ptd, int *nr_trips) trip_temp = readw(ptd->hw_base + WPT_CTT); trip_temp &= 0x1FF; if (trip_temp) { - /* Resolution of 1/2 degree C and an offset of -50C */ - ptd->crt_temp = trip_temp * 1000 / 2 - 50000; + ptd->crt_temp = GET_WPT_TEMP(trip_temp); ptd->crt_trip_id = 0; ++(*nr_trips); } @@ -177,8 +176,7 @@ static int pch_wpt_init(struct pch_thermal_device *ptd, int *nr_trips) trip_temp = readw(ptd->hw_base + WPT_PHL); trip_temp &= 0x1FF; if (trip_temp) { - /* Resolution of 1/2 degree C and an offset of -50C */ - ptd->hot_temp = trip_temp * 1000 / 2 - 50000; + ptd->hot_temp = GET_WPT_TEMP(trip_temp); ptd->hot_trip_id = *nr_trips; ++(*nr_trips); } @@ -190,12 +188,7 @@ static int pch_wpt_init(struct pch_thermal_device *ptd, int *nr_trips) static int pch_wpt_get_temp(struct pch_thermal_device *ptd, int *temp) { - u16 wpt_temp; - - wpt_temp = WPT_TEMP_TSR & readw(ptd->hw_base + WPT_TEMP); - - /* Resolution of 1/2 degree C and an offset of -50C */ - *temp = (wpt_temp * 1000 / 2 - 50000); + *temp = GET_WPT_TEMP(WPT_TEMP_TSR & readw(ptd->hw_base + WPT_TEMP)); return 0; } -- 2.28.0