redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

regulator: sy7636a: Remove unused mutex 

The reglock mutex is now only used in the regulator code,
and the built-in mutexes in the regulator framework does
the same thing.
zero-sugar
Lars Ivar Miljeteig 2021-03-12 11:00:14 +01:00
parent a4169efc99
commit c3c91540de
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/regulator/sy7636a-regulator.c
View File

@ -25,6 +25,7 @@
static int get_vcom_voltage_op(struct regulator_dev *rdev) static int get_vcom_voltage_op(struct regulator_dev *rdev)
{ {
int ret; int ret;
ret = get_vcom_voltage_mv(rdev->regmap); ret = get_vcom_voltage_mv(rdev->regmap);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -34,23 +35,10 @@ static int get_vcom_voltage_op(struct regulator_dev *rdev)
static int disable_regulator(struct regulator_dev *rdev) static int disable_regulator(struct regulator_dev *rdev)
{ {
struct sy7636a *sy7636a = dev_get_drvdata(rdev->dev.parent);
int ret = 0;
mutex_lock(&sy7636a->reglock);
ret = regulator_disable_regmap(rdev);
usleep_range(30000, 35000);
mutex_unlock(&sy7636a->reglock);
return ret;
}
static int sy7636a_regulator_is_enabled(struct regulator_dev *rdev)
{
struct sy7636a *sy7636a = dev_get_drvdata(rdev->dev.parent);
int ret; int ret;
mutex_lock(&sy7636a->reglock); ret = regulator_disable_regmap(rdev);
ret = regulator_is_enabled_regmap(rdev); usleep_range(30000, 35000);
mutex_unlock(&sy7636a->reglock);
return ret; return ret;
} }
@ -59,26 +47,22 @@ static int enable_regulator_pgood(struct regulator_dev *rdev)
{ {
struct sy7636a *sy7636a = dev_get_drvdata(rdev->dev.parent); struct sy7636a *sy7636a = dev_get_drvdata(rdev->dev.parent);
int pwr_good = 0; int pwr_good = 0;
int ret = 0; int ret;
unsigned long t0, t1; unsigned long t0, t1;
const unsigned int wait_time = 500; const unsigned int wait_time = 500;
unsigned int wait_cnt; unsigned int wait_cnt;
t0 = jiffies; t0 = jiffies;
mutex_lock(&sy7636a->reglock);
ret = regulator_enable_regmap(rdev); ret = regulator_enable_regmap(rdev);
if (ret) { if (ret)
goto finish; return ret;
}
for (wait_cnt = 0; wait_cnt < wait_time; wait_cnt++) { for (wait_cnt = 0; wait_cnt < wait_time; wait_cnt++) {
pwr_good = gpiod_get_value_cansleep(sy7636a->pgood_gpio); pwr_good = gpiod_get_value_cansleep(sy7636a->pgood_gpio);
if (pwr_good < 0) { if (pwr_good < 0) {
dev_err(&rdev->dev, "Failed to read pgood gpio: %d\n", pwr_good); dev_err(&rdev->dev, "Failed to read pgood gpio: %d\n", pwr_good);
ret = pwr_good; return pwr_good;
goto finish;
} }
else if (pwr_good) else if (pwr_good)
break; break;
@ -91,16 +75,13 @@ static int enable_regulator_pgood(struct regulator_dev *rdev)
if (!pwr_good) { if (!pwr_good) {
dev_err(&rdev->dev, "Power good signal timeout after %u ms\n", dev_err(&rdev->dev, "Power good signal timeout after %u ms\n",
jiffies_to_msecs(t1 - t0)); jiffies_to_msecs(t1 - t0));
ret = -ETIME; return -ETIME;
goto finish;
} }
dev_dbg(&rdev->dev, "Power good OK (took %u ms, %u waits)\n", dev_dbg(&rdev->dev, "Power good OK (took %u ms, %u waits)\n",
jiffies_to_msecs(t1 - t0), jiffies_to_msecs(t1 - t0),
wait_cnt); wait_cnt);
finish:
mutex_unlock(&sy7636a->reglock);
return ret; return ret;
} }
@ -108,7 +89,7 @@ static const struct regulator_ops sy7636a_vcom_volt_ops = {
.get_voltage = get_vcom_voltage_op, .get_voltage = get_vcom_voltage_op,
.enable = enable_regulator_pgood, .enable = enable_regulator_pgood,
.disable = disable_regulator, .disable = disable_regulator,
.is_enabled = sy7636a_regulator_is_enabled, .is_enabled = regulator_is_enabled_regmap,
}; };
struct regulator_desc desc = { struct regulator_desc desc = {
@ -136,7 +117,6 @@ static int sy7636a_regulator_suspend(struct device *dev)
struct sy7636a *sy7636a = dev_get_drvdata(dev->parent); struct sy7636a *sy7636a = dev_get_drvdata(dev->parent);
ret = get_vcom_voltage_mv(sy7636a->regmap); ret = get_vcom_voltage_mv(sy7636a->regmap);
if (ret > 0) if (ret > 0)
sy7636a->vcom = (unsigned int)ret; sy7636a->vcom = (unsigned int)ret;
@ -174,8 +154,6 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sy7636a); platform_set_drvdata(pdev, sy7636a);
mutex_init(&sy7636a->reglock);
gdp = devm_gpiod_get(sy7636a->dev, "epd-pwr-good", GPIOD_IN); gdp = devm_gpiod_get(sy7636a->dev, "epd-pwr-good", GPIOD_IN);
if (IS_ERR(gdp)) { if (IS_ERR(gdp)) {
dev_err(sy7636a->dev, "Power good GPIO fault %ld\n", PTR_ERR(gdp)); dev_err(sy7636a->dev, "Power good GPIO fault %ld\n", PTR_ERR(gdp));

1
include/linux/mfd/sy7636a.h
View File

@ -40,7 +40,6 @@ struct sy7636a {
struct regmap *regmap; struct regmap *regmap;
unsigned int vcom; unsigned int vcom;
struct gpio_desc *pgood_gpio; struct gpio_desc *pgood_gpio;
struct mutex reglock;
}; };
int get_vcom_voltage_mv(struct regmap *regmap); int get_vcom_voltage_mv(struct regmap *regmap);