thermal/drivers/qcom: Remove duplicate set next trip point interrupt code

The tsens driver reprogram the next trip points in the irq
handler. This function then call thermal_zone_device_update().

However, thermal_zone_device_update() calls thermal_zone_set_trips()
and from there it calls the backend 'set_trips' ops. This one in turn
reprogram the next trip points (low/high).

Consequently, the code setting the next trip points interrupt in the
interrupt handle is not needed and could be removed.

Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Acked-by: Amit Kucheria <amitk@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230116101955.3961427-1-daniel.lezcano@linaro.org

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 6d785ff..8020ead 100644 (file)
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -624,12 +624,9 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
 {
        struct tsens_priv *priv = data;
        struct tsens_irq_data d;
-       bool enable = true, disable = false;
-       unsigned long flags;
-       int temp, ret, i;
+       int i;
 
        for (i = 0; i < priv->num_sensors; i++) {
-               bool trigger = false;
                const struct tsens_sensor *s = &priv->sensor[i];
                u32 hw_id = s->hw_id;
 
@@ -637,52 +634,8 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
                        continue;
                if (!tsens_threshold_violated(priv, hw_id, &d))
                        continue;
-               ret = get_temp_tsens_valid(s, &temp);
-               if (ret) {
-                       dev_err(priv->dev, "[%u] %s: error reading sensor\n",
-                               hw_id, __func__);
-                       continue;
-               }
 
-               spin_lock_irqsave(&priv->ul_lock, flags);
-
-               tsens_read_irq_state(priv, hw_id, s, &d);
-
-               if (d.up_viol &&
-                   !masked_irq(hw_id, d.up_irq_mask, tsens_version(priv))) {
-                       tsens_set_interrupt(priv, hw_id, UPPER, disable);
-                       if (d.up_thresh > temp) {
-                               dev_dbg(priv->dev, "[%u] %s: re-arm upper\n",
-                                       hw_id, __func__);
-                               tsens_set_interrupt(priv, hw_id, UPPER, enable);
-                       } else {
-                               trigger = true;
-                               /* Keep irq masked */
-                       }
-               } else if (d.low_viol &&
-                          !masked_irq(hw_id, d.low_irq_mask, tsens_version(priv))) {
-                       tsens_set_interrupt(priv, hw_id, LOWER, disable);
-                       if (d.low_thresh < temp) {
-                               dev_dbg(priv->dev, "[%u] %s: re-arm low\n",
-                                       hw_id, __func__);
-                               tsens_set_interrupt(priv, hw_id, LOWER, enable);
-                       } else {
-                               trigger = true;
-                               /* Keep irq masked */
-                       }
-               }
-
-               spin_unlock_irqrestore(&priv->ul_lock, flags);
-
-               if (trigger) {
-                       dev_dbg(priv->dev, "[%u] %s: TZ update trigger (%d mC)\n",
-                               hw_id, __func__, temp);
-                       thermal_zone_device_update(s->tzd,
-                                                  THERMAL_EVENT_UNSPECIFIED);
-               } else {
-                       dev_dbg(priv->dev, "[%u] %s: no violation:  %d\n",
-                               hw_id, __func__, temp);
-               }
+               thermal_zone_device_update(s->tzd, THERMAL_EVENT_UNSPECIFIED);
 
                if (tsens_version(priv) < VER_0_1) {
                        /* Constraint: There is only 1 interrupt control register for all