Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52eafd66 authored by Amit Kucheria's avatar Amit Kucheria Committed by Eduardo Valentin
Browse files

drivers: thermal: tsens: Save reference to the device pointer and use it 



Code cleanup making it easier to read

Signed-off-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent c1997054

drivers/thermal/qcom/tsens-common.c

+8 −7
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static const struct regmap_config tsens_srot_config = { 
int __init init_common(struct tsens_priv *priv)

{

	void __iomem *tm_base, *srot_base;

	struct device *dev = priv->dev;

	struct resource *res;

	u32 enabled;

	int ret, i, j;
@@ -137,7 +138,7 @@ int __init init_common(struct tsens_priv *priv) 
			goto err_put_device;

		}



		priv->srot_map = devm_regmap_init_mmio(priv->dev, srot_base,

		priv->srot_map = devm_regmap_init_mmio(dev, srot_base,

							&tsens_srot_config);

		if (IS_ERR(priv->srot_map)) {

			ret = PTR_ERR(priv->srot_map);
@@ -155,13 +156,13 @@ int __init init_common(struct tsens_priv *priv) 
		goto err_put_device;

	}



	priv->tm_map = devm_regmap_init_mmio(priv->dev, tm_base, &tsens_config);

	priv->tm_map = devm_regmap_init_mmio(dev, tm_base, &tsens_config);

	if (IS_ERR(priv->tm_map)) {

		ret = PTR_ERR(priv->tm_map);

		goto err_put_device;

	}



	priv->rf[TSENS_EN] = devm_regmap_field_alloc(priv->dev, priv->srot_map,

	priv->rf[TSENS_EN] = devm_regmap_field_alloc(dev, priv->srot_map,

						     priv->fields[TSENS_EN]);

	if (IS_ERR(priv->rf[TSENS_EN])) {

		ret = PTR_ERR(priv->rf[TSENS_EN]);
@@ -171,12 +172,12 @@ int __init init_common(struct tsens_priv *priv) 
	if (ret)

		goto err_put_device;

	if (!enabled) {

		dev_err(priv->dev, "tsens device is not enabled\n");

		dev_err(dev, "tsens device is not enabled\n");

		ret = -ENODEV;

		goto err_put_device;

	}



	priv->rf[SENSOR_EN] = devm_regmap_field_alloc(priv->dev, priv->srot_map,

	priv->rf[SENSOR_EN] = devm_regmap_field_alloc(dev, priv->srot_map,

						      priv->fields[SENSOR_EN]);

	if (IS_ERR(priv->rf[SENSOR_EN])) {

		ret = PTR_ERR(priv->rf[SENSOR_EN]);
@@ -184,7 +185,7 @@ int __init init_common(struct tsens_priv *priv) 
	}

	/* now alloc regmap_fields in tm_map */

	for (i = 0, j = LAST_TEMP_0; i < priv->num_sensors; i++, j++) {

		priv->rf[j] = devm_regmap_field_alloc(priv->dev, priv->tm_map,

		priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map,

						      priv->fields[j]);

		if (IS_ERR(priv->rf[j])) {

			ret = PTR_ERR(priv->rf[j]);
@@ -192,7 +193,7 @@ int __init init_common(struct tsens_priv *priv) 
		}

	}

	for (i = 0, j = VALID_0; i < priv->num_sensors; i++, j++) {

		priv->rf[j] = devm_regmap_field_alloc(priv->dev, priv->tm_map,

		priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map,

						      priv->fields[j]);

		if (IS_ERR(priv->rf[j])) {

			ret = PTR_ERR(priv->rf[j]);