thermal: tsens: Rename variable

We're actually reading the temperature from the status register. Fix the
variable name to reflect that.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index c22dc18..25e7f24 100644 (file)
--- 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 f40150f..908e3dc 100644 (file)
--- 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) {