Commit e604bdd2 authored by Amit Kucheria's avatar Amit Kucheria Committed by Daniel Lezcano

drivers: thermal: tsens: Pass around struct tsens_sensor as a constant

All the sensor data is initialised at init time. Lock it down by passing
it to functions as a constant.
Signed-off-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/740f9254484c08d65869df578628eb523c0049ff.1584015867.git.amit.kucheria@linaro.org
parent 0aef1ee5
...@@ -245,7 +245,7 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) ...@@ -245,7 +245,7 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
return adc_code * slope + offset; 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; int ret;
u32 code, trdy; u32 code, trdy;
......
...@@ -128,7 +128,7 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s) ...@@ -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 * Return: Temperature in milliCelsius on success, a negative errno will
* be returned in error cases * 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; struct tsens_priv *priv = s->priv;
u32 resolution; u32 resolution;
...@@ -160,7 +160,7 @@ static int tsens_hw_to_mC(struct tsens_sensor *s, int field) ...@@ -160,7 +160,7 @@ static int tsens_hw_to_mC(struct tsens_sensor *s, int field)
* *
* Return: ADC code or temperature in deciCelsius. * 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; struct tsens_priv *priv = s->priv;
...@@ -275,7 +275,8 @@ static int tsens_threshold_violated(struct tsens_priv *priv, u32 hw_id, ...@@ -275,7 +275,8 @@ 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, 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; int ret;
...@@ -346,10 +347,10 @@ irqreturn_t tsens_irq_thread(int irq, void *data) ...@@ -346,10 +347,10 @@ irqreturn_t tsens_irq_thread(int irq, void *data)
for (i = 0; i < priv->num_sensors; i++) { for (i = 0; i < priv->num_sensors; i++) {
bool trigger = false; bool trigger = false;
struct tsens_sensor *s = &priv->sensor[i]; const struct tsens_sensor *s = &priv->sensor[i];
u32 hw_id = s->hw_id; u32 hw_id = s->hw_id;
if (IS_ERR(priv->sensor[i].tzd)) if (IS_ERR(s->tzd))
continue; continue;
if (!tsens_threshold_violated(priv, hw_id, &d)) if (!tsens_threshold_violated(priv, hw_id, &d))
continue; continue;
...@@ -457,7 +458,7 @@ void tsens_disable_irq(struct tsens_priv *priv) ...@@ -457,7 +458,7 @@ void tsens_disable_irq(struct tsens_priv *priv)
regmap_field_write(priv->rf[INT_EN], 0); 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; struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id; int hw_id = s->hw_id;
...@@ -486,7 +487,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp) ...@@ -486,7 +487,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp)
return 0; 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; struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id; int hw_id = s->hw_id;
......
...@@ -67,7 +67,7 @@ struct tsens_ops { ...@@ -67,7 +67,7 @@ struct tsens_ops {
/* mandatory callbacks */ /* mandatory callbacks */
int (*init)(struct tsens_priv *priv); int (*init)(struct tsens_priv *priv);
int (*calibrate)(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 */ /* optional callbacks */
int (*enable)(struct tsens_priv *priv, int i); int (*enable)(struct tsens_priv *priv, int i);
void (*disable)(struct tsens_priv *priv); void (*disable)(struct tsens_priv *priv);
...@@ -494,8 +494,8 @@ struct tsens_priv { ...@@ -494,8 +494,8 @@ struct tsens_priv {
char *qfprom_read(struct device *dev, const char *cname); char *qfprom_read(struct device *dev, const char *cname);
void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mode); void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mode);
int init_common(struct tsens_priv *priv); int init_common(struct tsens_priv *priv);
int get_temp_tsens_valid(struct tsens_sensor *s, int *temp); int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp);
int get_temp_common(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); int tsens_enable_irq(struct tsens_priv *priv);
void tsens_disable_irq(struct tsens_priv *priv); void tsens_disable_irq(struct tsens_priv *priv);
int tsens_set_trips(void *_sensor, int low, int high); int tsens_set_trips(void *_sensor, int low, int high);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment