From patchwork Thu Jul 26 10:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 10545589 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38F7114BC for ; Thu, 26 Jul 2018 10:33:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27DAC285FC for ; Thu, 26 Jul 2018 10:33:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C0B02A7E8; Thu, 26 Jul 2018 10:33:41 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 A31E6285FC for ; Thu, 26 Jul 2018 10:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729277AbeGZLtw (ORCPT ); Thu, 26 Jul 2018 07:49:52 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40724 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729107AbeGZLts (ORCPT ); Thu, 26 Jul 2018 07:49:48 -0400 Received: by mail-wr1-f66.google.com with SMTP id h15-v6so1189398wrs.7 for ; Thu, 26 Jul 2018 03:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=LlTjF7iTHMsf57iFeH6E85/+9b8NIV2YUPikYA5LJe8=; b=GR4XghGin49xYSALOShEfosJa0gs/9O2sxviVln6NkAacwYKHQ+bk5pAuxLdXxHz4s qCaei9mwgM/oAsD8CK23kAy5DvOa26Q9QGSIaTf0EcJMJv+pgc2QbGnCmkWPgDTCu10Q 09UYU7+Wn5GLF4aokTqvXzaKZIT+iBaGixhYA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=LlTjF7iTHMsf57iFeH6E85/+9b8NIV2YUPikYA5LJe8=; b=SGG0shcDpWBavKFfQa7yfuFcbTtQc6v232zpqHJZw36Ga1V6cktQdDVJRcqDbPs0MX ybXURJXDHMsLTpoSBM7pwHwmDcKgjpkfzA2k6TrpE6SwPNcykut7QC5KN0HV63kvZ/yO xGe66vwD0XiMqbW9/k7nBsOe71MNP1WXQoMcW28GG50xG5I1o4Kwd8EVRrzSku9JIMob 8RhMVJ1dDGkg9Jw6OlnWb/ZfjUQn2sQCVw2y8SmWeer3ZQYomQ4xmvru5h34uzOHI7aF dKnTjkSucCrmmBbWJjMzAuBu2ugCD1231IMzlyJWDQRpH+bVEvFC58Bmujk70burSHmU DEdw== X-Gm-Message-State: AOUpUlEWBd4xUWgIzteIfJOKE+jtnsf4sqBsLzG9siwHucyB/9htR6RJ Bgkjy4/OZe9dmrwEajgwUqn3UA== X-Google-Smtp-Source: AAOMgpd28a9hNsoPhDnrIvIv28+mI/kincmZms0Us/D/3iTdR8PzkZxaebj++yDyQN2E3z7KG4rR8A== X-Received: by 2002:adf:a197:: with SMTP id u23-v6mr1210365wru.50.1532601214477; Thu, 26 Jul 2018 03:33:34 -0700 (PDT) Received: from localhost ([49.248.197.57]) by smtp.gmail.com with ESMTPSA id x62-v6sm1458087wmg.1.2018.07.26.03.33.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 03:33:33 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, smohanad@codeaurora.org, andy.gross@linaro.org, dianders@chromium.org, mka@chromium.org, Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH v2 1/3] thermal: tsens: Rename variable Date: Thu, 26 Jul 2018 16:03:08 +0530 Message-Id: <5160b58d1d14b87b84ea49adc804afbefb792c34.1532600791.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.GIT In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We're actually reading the temperature from the status register. Fix the variable name to reflect that. Signed-off-by: Amit Kucheria Reviewed-by: Matthias Kaehlcke Reviewed-by: Bjorn Andersson --- drivers/thermal/qcom/tsens-common.c | 6 +++--- drivers/thermal/qcom/tsens-v2.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index c22dc18c7c65..25e7f247b027 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -104,11 +104,11 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp) { struct tsens_sensor *s = &tmdev->sensor[id]; u32 code; - unsigned int sensor_addr; + unsigned int status_reg; int last_temp = 0, ret; - sensor_addr = S0_ST_ADDR + s->hw_id * SN_ADDR_OFFSET; - ret = regmap_read(tmdev->map, sensor_addr, &code); + status_reg = S0_ST_ADDR + s->hw_id * SN_ADDR_OFFSET; + ret = regmap_read(tmdev->map, status_reg, &code); if (ret) return ret; last_temp = code & SN_ST_TEMP_MASK; diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index f40150fd7eae..908e3dcb2d5c 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -16,11 +16,11 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) { struct tsens_sensor *s = &tmdev->sensor[id]; u32 code; - unsigned int sensor_addr; + unsigned int status_reg; int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret; - sensor_addr = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4; - ret = regmap_read(tmdev->map, sensor_addr, &code); + status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4; + ret = regmap_read(tmdev->map, status_reg, &code); if (ret) return ret; last_temp = code & LAST_TEMP_MASK; @@ -28,7 +28,7 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) goto done; /* Try a second time */ - ret = regmap_read(tmdev->map, sensor_addr, &code); + ret = regmap_read(tmdev->map, status_reg, &code); if (ret) return ret; if (code & STATUS_VALID_BIT) { @@ -39,7 +39,7 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) } /* Try a third/last time */ - ret = regmap_read(tmdev->map, sensor_addr, &code); + ret = regmap_read(tmdev->map, status_reg, &code); if (ret) return ret; if (code & STATUS_VALID_BIT) {