From a2c160f479ac7ca6fafb2f4a46c12b8d0196194e Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Thu, 13 Aug 2020 09:39:54 +0800 Subject: [PATCH] regulator: rk808: remove redundant code Signed-off-by: shengfei Xu Change-Id: I51d524173b1f477660bb839de77533be98417077 --- drivers/regulator/rk808-regulator.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index f51123161452..8d29723827ea 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -776,16 +776,6 @@ static unsigned int rk8xx_get_mode(struct regulator_dev *rdev) static int rk8xx_enabled_wmsk_regmap(struct regulator_dev *rdev) { - unsigned int val; - int ret; - - ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val); - if (ret != 0) - return ret; - - if (val & rdev->desc->enable_val) - return 0; - return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, rdev->desc->enable_mask, @@ -794,20 +784,10 @@ static int rk8xx_enabled_wmsk_regmap(struct regulator_dev *rdev) static int rk8xx_disabled_wmsk_regmap(struct regulator_dev *rdev) { - unsigned int val; - int ret; - - ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val); - if (ret != 0) - return ret; - - if (val & rdev->desc->enable_val) - return regmap_update_bits(rdev->regmap, - rdev->desc->enable_reg, - rdev->desc->enable_mask, - rdev->desc->disable_val); - - return 0; + return regmap_update_bits(rdev->regmap, + rdev->desc->enable_reg, + rdev->desc->enable_mask, + rdev->desc->disable_val); } static int rk8xx_is_enabled_wmsk_regmap(struct regulator_dev *rdev)