thermal/drivers/qcom: Remove duplicate set next trip point interrupt code
Subsystems (3)
PATCH 1/1 thermal/drivers/qcom: Remove duplicate set next trip point interrupt code
From: Daniel Lezcano <[email protected]>
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.
--- drivers/thermal/qcom/tsens.c | 46 +----------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-)
drivers/thermal/qcom/tsens.c +1 -45
@@ -472,52 +472,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
Signature · 1 line
2.34.1
Rafael J. Wysocki
maintainerQuoted 10 lines · Daniel Lezcano
From: Daniel Lezcano <[email protected]>
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()callsthermal_zone_set_trips()and from there it calls the backend 'set_trips' ops. This one in turn reprogram the next trip points (low/high).
Quoted 5 lines
Consequently, the code setting the next trip points interrupt in the interrupt handle is not needed and could be removed.
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>
I'm wondering what you wanted to say through these S-o-b tags.
I don't think you have to sign off your own patch again.
Quoted 65 lines
--- drivers/thermal/qcom/tsens.c | 46 +----------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-)drivers/thermal/qcom/tsens.c +1
-46@@ -472,52 +472,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 -- 2.34.1
Quoted 15 lines · Rafael J. Wysocki
Quoted 13 lines · Daniel Lezcano
From: Daniel Lezcano <[email protected]>
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()callsthermal_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.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>I'm wondering what you wanted to say through these S-o-b tags.
I don't think you have to sign off your own patch again.
Yes, I changed a configuration in my git tree, something I have to fix. That has to be considered as duplicate SoB
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Quoted 5 lines · Daniel Lezcano
From: Daniel Lezcano <[email protected]>
The tsens driver reprogram the next trip points in the irq handler. This function then call
thermal_zone_device_update().
Quoted 7 lines
However,
thermal_zone_device_update()callsthermal_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.
Quoted 2 lines
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>
The last one should be the address you sent your patch from, and that was the first one. So I think you should drop this one.
Regards,
Bjorn
Quoted 65 lines
--- drivers/thermal/qcom/tsens.c | 46 +----------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-)drivers/thermal/qcom/tsens.c +1
-45@@ -472,52 +472,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 Signature · 1 line
2.34.1
Quoted 15 lines · Bjorn Andersson
Quoted 5 lines · Daniel Lezcano
From: Daniel Lezcano <[email protected]>
The tsens driver reprogram the next trip points in the irq handler. This function then call
thermal_zone_device_update().Quoted 7 lines
However,
thermal_zone_device_update()callsthermal_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.
Quoted 7 lines
Reviewed-by Bjorn Andersson <[email protected]>Quoted 2 lines
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>The last one should be the address you sent your patch from, and that was the first one. So I think you should drop this one.
Thanks for the review. I'll remove the duplicated SoB.
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Quoted 10 lines · Daniel Lezcano
From: Daniel Lezcano <[email protected]>
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()callsthermal_zone_set_trips()and from there it calls the backend 'set_trips' ops. This one in turn reprogram the next trip points (low/high).
Quoted 5 lines
Consequently, the code setting the next trip points interrupt in the interrupt handle is not needed and could be removed.
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>
Quoted 65 lines
--- drivers/thermal/qcom/tsens.c | 46 +----------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-)drivers/thermal/qcom/tsens.c +1
-46@@ -472,52 +472,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 -- 2.34.1