[PATCH v2 11/23] thermal: armada: get rid of the ->is_valid() pointer

Miquel Raynal
2018-06-25T15:12:27Z

The implementation of armada_is_valid() is very simple and is the same
across all the versions of the IP since the ->is_valid_bit has been
introduced. Simplify the structure by getting rid of the function
pointer and calling directly the function.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/thermal/armada_thermal.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 4e9f947a0f5f..66324fc853a3 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -82,9 +82,6 @@ struct armada_thermal_data {
void (*init)(struct platform_device *pdev,
struct armada_thermal_priv *priv);

- /* Test for a valid sensor value (optional) */
- bool (*is_valid)(struct armada_thermal_priv *);
-
/* Formula coeficients: temp = (b - m * reg) / div */
s64 coef_b;
s64 coef_m;
@@ -266,6 +263,9 @@ static bool armada_is_valid(struct armada_thermal_priv *priv)
{
u32 reg;

+ if (!priv->data->is_valid_bit)
+ return true;
+
regmap_read(priv->syscon, priv->data->syscon_status_off, &reg);

return reg & priv->data->is_valid_bit;
@@ -357,7 +357,7 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal,
int ret;

/* Valid check */
- if (priv->data->is_valid && !priv->data->is_valid(priv)) {
+ if (armada_is_valid(priv)) {
dev_err(priv->dev,
"Temperature sensor reading not valid\n");
return -EIO;
@@ -417,7 +417,6 @@ static const struct armada_thermal_data armadaxp_data = {
};

static const struct armada_thermal_data armada370_data = {
- .is_valid = armada_is_valid,
.init = armada370_init,
.is_valid_bit = BIT(9),
.temp_shift = 10,
@@ -430,7 +429,6 @@ static const struct armada_thermal_data armada370_data = {
};

static const struct armada_thermal_data armada375_data = {
- .is_valid = armada_is_valid,
.init = armada375_init,
.is_valid_bit = BIT(10),
.temp_shift = 0,
@@ -444,7 +442,6 @@ static const struct armada_thermal_data armada375_data = {
};

static const struct armada_thermal_data armada380_data = {
- .is_valid = armada_is_valid,
.init = armada380_init,
.is_valid_bit = BIT(10),
.temp_shift = 0,
@@ -459,7 +456,6 @@ static const struct armada_thermal_data armada380_data = {
};

static const struct armada_thermal_data armada_ap806_data = {
- .is_valid = armada_is_valid,
.init = armada_ap806_init,
.is_valid_bit = BIT(16),
.temp_shift = 0,
@@ -476,7 +472,6 @@ static const struct armada_thermal_data armada_ap806_data = {
};

static const struct armada_thermal_data armada_cp110_data = {
- .is_valid = armada_is_valid,
.init = armada_cp110_init,
.is_valid_bit = BIT(10),
.temp_shift = 0,
--
2.14.1