evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: mc13783: Make mc13783_powermisc_rmw() lock protected

Browse source 
Then we can remove lock/unlock around the caller.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-07-19 11:16:06 +08:00 • committed by Mark Brown
parent 4a247a961a
commit 2a2c3ac0a5
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/regulator/mc13783-regulator.c
View file

@ -238,9 +238,10 @@ static int mc13783_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
BUG_ON(val & ~mask); BUG_ON(val & ~mask);
mc13xxx_lock(priv->mc13xxx);
ret = mc13xxx_reg_read(mc13783, MC13783_REG_POWERMISC, &valread); ret = mc13xxx_reg_read(mc13783, MC13783_REG_POWERMISC, &valread);
if (ret) if (ret)
return ret; goto out;
/* Update the stored state for Power Gates. */ /* Update the stored state for Power Gates. */
priv->powermisc_pwgt_state = priv->powermisc_pwgt_state =
@ -253,7 +254,10 @@ static int mc13783_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M) | valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M) |
priv->powermisc_pwgt_state; priv->powermisc_pwgt_state;
return mc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread); ret = mc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread);
out:
mc13xxx_unlock(priv->mc13xxx);
return ret;
} }
static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev) static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
@ -261,7 +265,6 @@ static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
int id = rdev_get_id(rdev); int id = rdev_get_id(rdev);
int ret;
u32 en_val = mc13xxx_regulators[id].enable_bit; u32 en_val = mc13xxx_regulators[id].enable_bit;
dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
@ -271,12 +274,8 @@ static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
id == MC13783_REG_PWGT2SPI) id == MC13783_REG_PWGT2SPI)
en_val = 0; en_val = 0;
mc13xxx_lock(priv->mc13xxx); return mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
ret = mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
en_val); en_val);
mc13xxx_unlock(priv->mc13xxx);
return ret;
} }
static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev) static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
@ -284,7 +283,6 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
int id = rdev_get_id(rdev); int id = rdev_get_id(rdev);
int ret;
u32 dis_val = 0; u32 dis_val = 0;
dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
@ -294,12 +292,8 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
id == MC13783_REG_PWGT2SPI) id == MC13783_REG_PWGT2SPI)
dis_val = mc13xxx_regulators[id].enable_bit; dis_val = mc13xxx_regulators[id].enable_bit;
mc13xxx_lock(priv->mc13xxx); return mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
ret = mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
dis_val); dis_val);
mc13xxx_unlock(priv->mc13xxx);
return ret;
} }
static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev) static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)