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

Commit 7dd33c1d authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Mark Brown
Browse files

regulator: mc13xxx: Remove unnecessary locks 



Read-modify-write sequence is already protected by regmap, so no
additional locks need. This patch remove such locks from mc13xxx
regulator driver.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3865e11d

drivers/regulator/mc13xxx-regulator-core.c

+8 −29
Original line number Diff line number Diff line
@@ -33,17 +33,12 @@ static int mc13xxx_regulator_enable(struct regulator_dev *rdev) 
	struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);

	struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;

	int id = rdev_get_id(rdev);

	int ret;



	dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg,

	return mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg,

			       mc13xxx_regulators[id].enable_bit,

			       mc13xxx_regulators[id].enable_bit);

	mc13xxx_unlock(priv->mc13xxx);



	return ret;

}



static int mc13xxx_regulator_disable(struct regulator_dev *rdev)
@@ -51,16 +46,11 @@ static int mc13xxx_regulator_disable(struct regulator_dev *rdev) 
	struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);

	struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;

	int id = rdev_get_id(rdev);

	int ret;



	dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg,

	return mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg,

			       mc13xxx_regulators[id].enable_bit, 0);

	mc13xxx_unlock(priv->mc13xxx);



	return ret;

}



static int mc13xxx_regulator_is_enabled(struct regulator_dev *rdev)
@@ -70,10 +60,7 @@ static int mc13xxx_regulator_is_enabled(struct regulator_dev *rdev) 
	int ret, id = rdev_get_id(rdev);

	unsigned int val;



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_read(priv->mc13xxx, mc13xxx_regulators[id].reg, &val);

	mc13xxx_unlock(priv->mc13xxx);



	if (ret)

		return ret;
@@ -86,15 +73,10 @@ static int mc13xxx_regulator_set_voltage_sel(struct regulator_dev *rdev, 
	struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);

	struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;

	int id = rdev_get_id(rdev);

	int ret;



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].vsel_reg,

	return mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].vsel_reg,

			       mc13xxx_regulators[id].vsel_mask,

			       selector << mc13xxx_regulators[id].vsel_shift);

	mc13xxx_unlock(priv->mc13xxx);



	return ret;

}



static int mc13xxx_regulator_get_voltage(struct regulator_dev *rdev)
@@ -106,11 +88,8 @@ static int mc13xxx_regulator_get_voltage(struct regulator_dev *rdev) 


	dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);



	mc13xxx_lock(priv->mc13xxx);

	ret = mc13xxx_reg_read(priv->mc13xxx,

				mc13xxx_regulators[id].vsel_reg, &val);

	mc13xxx_unlock(priv->mc13xxx);



	if (ret)

		return ret;