All the sensor data is initialised at init time. Lock it down by passing
it to functions as a constant.
Signed-off-by: Amit Kucheria <[email protected]>
---
drivers/thermal/qcom/tsens-8960.c | 2 +-
drivers/thermal/qcom/tsens-common.c | 14 +++++++-------
drivers/thermal/qcom/tsens.h | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index a383a57cfbbc..2a28a5af209e 100644
--- a/drivers/thermal/qcom/tsens-8960.c
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -245,7 +245,7 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
return adc_code * slope + offset;
}
-static int get_temp_8960(struct tsens_sensor *s, int *temp)
+static int get_temp_8960(const struct tsens_sensor *s, int *temp)
{
int ret;
u32 code, trdy;
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index c8d57ee0a5bb..c2df30a08b9e 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -128,7 +128,7 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
* Return: Temperature in milliCelsius on success, a negative errno will
* be returned in error cases
*/
-static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
+static int tsens_hw_to_mC(const struct tsens_sensor *s, int field)
{
struct tsens_priv *priv = s->priv;
u32 resolution;
@@ -160,7 +160,7 @@ static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
*
* Return: ADC code or temperature in deciCelsius.
*/
-static int tsens_mC_to_hw(struct tsens_sensor *s, int temp)
+static int tsens_mC_to_hw(const struct tsens_sensor *s, int temp)
{
struct tsens_priv *priv = s->priv;
@@ -275,7 +275,7 @@ static int tsens_threshold_violated(struct tsens_priv *priv, u32 hw_id,
}
static int tsens_read_irq_state(struct tsens_priv *priv, u32 hw_id,
- struct tsens_sensor *s, struct tsens_irq_data *d)
+ const struct tsens_sensor *s, struct tsens_irq_data *d)
{
int ret;
@@ -346,10 +346,10 @@ irqreturn_t tsens_irq_thread(int irq, void *data)
for (i = 0; i < priv->num_sensors; i++) {
bool trigger = false;
- struct tsens_sensor *s = &priv->sensor[i];
+ const struct tsens_sensor *s = &priv->sensor[i];
u32 hw_id = s->hw_id;
- if (IS_ERR(priv->sensor[i].tzd))
+ if (IS_ERR(s->tzd))
continue;
if (!tsens_threshold_violated(priv, hw_id, &d))
continue;
@@ -457,7 +457,7 @@ void tsens_disable_irq(struct tsens_priv *priv)
regmap_field_write(priv->rf[INT_EN], 0);
}
-int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
+int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp)
{
struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id;
@@ -486,7 +486,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
return 0;
}
-int get_temp_common(struct tsens_sensor *s, int *temp)
+int get_temp_common(const struct tsens_sensor *s, int *temp)
{
struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id;
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index be364bf1d5a6..70dc34c80537 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -67,7 +67,7 @@ struct tsens_ops {
/* mandatory callbacks */
int (*init)(struct tsens_priv *priv);
int (*calibrate)(struct tsens_priv *priv);
- int (*get_temp)(struct tsens_sensor *s, int *temp);
+ int (*get_temp)(const struct tsens_sensor *s, int *temp);
/* optional callbacks */
int (*enable)(struct tsens_priv *priv, int i);
void (*disable)(struct tsens_priv *priv);
@@ -494,8 +494,8 @@ struct tsens_priv {
char *qfprom_read(struct device *dev, const char *cname);
void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mode);
int init_common(struct tsens_priv *priv);
-int get_temp_tsens_valid(struct tsens_sensor *s, int *temp);
-int get_temp_common(struct tsens_sensor *s, int *temp);
+int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp);
+int get_temp_common(const struct tsens_sensor *s, int *temp);
int tsens_enable_irq(struct tsens_priv *priv);
void tsens_disable_irq(struct tsens_priv *priv);
int tsens_set_trips(void *_sensor, int low, int high);
--
2.20.1
On Thu 02 Jan 06:54 PST 2020, Amit Kucheria wrote:
> All the sensor data is initialised at init time. Lock it down by passing
> it to functions as a constant.
>
Reviewed-by: Bjorn Andersson <[email protected]>
> Signed-off-by: Amit Kucheria <[email protected]>
> ---
> drivers/thermal/qcom/tsens-8960.c | 2 +-
> drivers/thermal/qcom/tsens-common.c | 14 +++++++-------
> drivers/thermal/qcom/tsens.h | 6 +++---
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
> index a383a57cfbbc..2a28a5af209e 100644
> --- a/drivers/thermal/qcom/tsens-8960.c
> +++ b/drivers/thermal/qcom/tsens-8960.c
> @@ -245,7 +245,7 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
> return adc_code * slope + offset;
> }
>
> -static int get_temp_8960(struct tsens_sensor *s, int *temp)
> +static int get_temp_8960(const struct tsens_sensor *s, int *temp)
> {
> int ret;
> u32 code, trdy;
> diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
> index c8d57ee0a5bb..c2df30a08b9e 100644
> --- a/drivers/thermal/qcom/tsens-common.c
> +++ b/drivers/thermal/qcom/tsens-common.c
> @@ -128,7 +128,7 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
> * Return: Temperature in milliCelsius on success, a negative errno will
> * be returned in error cases
> */
> -static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
> +static int tsens_hw_to_mC(const struct tsens_sensor *s, int field)
> {
> struct tsens_priv *priv = s->priv;
> u32 resolution;
> @@ -160,7 +160,7 @@ static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
> *
> * Return: ADC code or temperature in deciCelsius.
> */
> -static int tsens_mC_to_hw(struct tsens_sensor *s, int temp)
> +static int tsens_mC_to_hw(const struct tsens_sensor *s, int temp)
> {
> struct tsens_priv *priv = s->priv;
>
> @@ -275,7 +275,7 @@ static int tsens_threshold_violated(struct tsens_priv *priv, u32 hw_id,
> }
>
> static int tsens_read_irq_state(struct tsens_priv *priv, u32 hw_id,
> - struct tsens_sensor *s, struct tsens_irq_data *d)
> + const struct tsens_sensor *s, struct tsens_irq_data *d)
> {
> int ret;
>
> @@ -346,10 +346,10 @@ irqreturn_t tsens_irq_thread(int irq, void *data)
>
> for (i = 0; i < priv->num_sensors; i++) {
> bool trigger = false;
> - struct tsens_sensor *s = &priv->sensor[i];
> + const struct tsens_sensor *s = &priv->sensor[i];
> u32 hw_id = s->hw_id;
>
> - if (IS_ERR(priv->sensor[i].tzd))
> + if (IS_ERR(s->tzd))
> continue;
> if (!tsens_threshold_violated(priv, hw_id, &d))
> continue;
> @@ -457,7 +457,7 @@ void tsens_disable_irq(struct tsens_priv *priv)
> regmap_field_write(priv->rf[INT_EN], 0);
> }
>
> -int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
> +int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp)
> {
> struct tsens_priv *priv = s->priv;
> int hw_id = s->hw_id;
> @@ -486,7 +486,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
> return 0;
> }
>
> -int get_temp_common(struct tsens_sensor *s, int *temp)
> +int get_temp_common(const struct tsens_sensor *s, int *temp)
> {
> struct tsens_priv *priv = s->priv;
> int hw_id = s->hw_id;
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index be364bf1d5a6..70dc34c80537 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -67,7 +67,7 @@ struct tsens_ops {
> /* mandatory callbacks */
> int (*init)(struct tsens_priv *priv);
> int (*calibrate)(struct tsens_priv *priv);
> - int (*get_temp)(struct tsens_sensor *s, int *temp);
> + int (*get_temp)(const struct tsens_sensor *s, int *temp);
> /* optional callbacks */
> int (*enable)(struct tsens_priv *priv, int i);
> void (*disable)(struct tsens_priv *priv);
> @@ -494,8 +494,8 @@ struct tsens_priv {
> char *qfprom_read(struct device *dev, const char *cname);
> void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mode);
> int init_common(struct tsens_priv *priv);
> -int get_temp_tsens_valid(struct tsens_sensor *s, int *temp);
> -int get_temp_common(struct tsens_sensor *s, int *temp);
> +int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp);
> +int get_temp_common(const struct tsens_sensor *s, int *temp);
> int tsens_enable_irq(struct tsens_priv *priv);
> void tsens_disable_irq(struct tsens_priv *priv);
> int tsens_set_trips(void *_sensor, int low, int high);
> --
> 2.20.1
>