regulator: tps65219: Fix is_enabled checking in tps65219_set_bypass

AxelLin · broonie · commit 947934e389f7 · 2022-09-26T16:10:33.000+01:00
Testing .enable cannot tell if a regulator is enabled or not, check return value of .is_enabled() instead. Also remove unneeded ret variable. Signed-off-by: Axel Lin <axel.lin@ingics.com> Link: https://lore.kernel.org/r/20220919122353.384171-1-axel.lin@ingics.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/drivers/regulator/tps65219-regulator.c b/drivers/regulator/tps65219-regulator.c
@@ -181,16 +181,14 @@ static int tps65219_set_bypass(struct regulator_dev *dev, bool enable)
 {
 	struct tps65219 *tps = rdev_get_drvdata(dev);
 	unsigned int rid = rdev_get_id(dev);
-	int ret = 0;
 
-	if (dev->desc->ops->enable) {
+	if (dev->desc->ops->is_enabled(dev)) {
 		dev_err(tps->dev,
 			"%s LDO%d enabled, must be shut down to set bypass ",
 			__func__, rid);
 		return -EBUSY;
 	}
-	ret =  regulator_set_bypass_regmap(dev, enable);
-	return ret;
+	return regulator_set_bypass_regmap(dev, enable);
 }
 
 /* Operations permitted on BUCK1/2/3 */

Original file line number	Diff line number	Diff line change
`@@ -181,16 +181,14 @@ static int tps65219_set_bypass(struct regulator_dev *dev, bool enable)`
`181`	`181`	`{`
`182`	`182`	`struct tps65219 *tps = rdev_get_drvdata(dev);`
`183`	`183`	`unsigned int rid = rdev_get_id(dev);`
`184`		`- int ret = 0;`
`185`	`184`
`186`		`- if (dev->desc->ops->enable) {`
	`185`	`+ if (dev->desc->ops->is_enabled(dev)) {`
`187`	`186`	`dev_err(tps->dev,`
`188`	`187`	`"%s LDO%d enabled, must be shut down to set bypass ",`
`189`	`188`	`__func__, rid);`
`190`	`189`	`return -EBUSY;`
`191`	`190`	`}`
`192`		`- ret = regulator_set_bypass_regmap(dev, enable);`
`193`		`- return ret;`
	`191`	`+ return regulator_set_bypass_regmap(dev, enable);`
`194`	`192`	`}`
`195`	`193`
`196`	`194`	`/* Operations permitted on BUCK1/2/3 */`