diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:16:09 -0700 |
| commit | 378e853f68e9a9548c64687880715ac3cca31c22 (patch) | |
| tree | 7ede3af6a1da3223e13321d9453a57c48ac5372f /drivers/thermal/qcom/tsens-common.c | |
| parent | Merge tag 'led-fixes-for-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds (diff) | |
| parent | Revert "drivers: thermal: tsens: Add new operation to check if a sensor is enabled" (diff) | |
| download | linux-dev-378e853f68e9a9548c64687880715ac3cca31c22.tar.xz linux-dev-378e853f68e9a9548c64687880715ac3cca31c22.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal SoC fix from Eduardo Valentin:
"A single revert, detected to cause issues on the tsens driver"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
Revert "drivers: thermal: tsens: Add new operation to check if a sensor is enabled"
Diffstat (limited to 'drivers/thermal/qcom/tsens-common.c')
| -rw-r--r-- | drivers/thermal/qcom/tsens-common.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index 928e8e81ba69..528df8801254 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -64,20 +64,6 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1, } } -bool is_sensor_enabled(struct tsens_priv *priv, u32 hw_id) -{ - u32 val; - int ret; - - if ((hw_id > (priv->num_sensors - 1)) || (hw_id < 0)) - return -EINVAL; - ret = regmap_field_read(priv->rf[SENSOR_EN], &val); - if (ret) - return ret; - - return val & (1 << hw_id); -} - static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s) { int degc, num, den; |