From 0f94bffad401faa045c2062f1652d21e3e89f439 Mon Sep 17 00:00:00 2001 From: Julia Lawall <julia.lawall@lip6.fr> Date: Tue, 16 Jun 2015 06:45:14 -0700 Subject: [PATCH] regulator: fix simple_return.cocci warnings Simplify a trivial if-return sequence and combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci CC: Mark Brown <broonie@kernel.org> Signed-off-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/regulator/qcom_spmi-regulator.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index 162b86501a917..15bba2b4ef70d 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -710,12 +710,8 @@ static int spmi_regulator_ult_lo_smps_set_voltage(struct regulator_dev *rdev, if (range_sel == 1) voltage_sel |= ULT_SMPS_RANGE_SPLIT; - ret = spmi_vreg_update_bits(vreg, SPMI_COMMON_REG_VOLTAGE_SET, + return spmi_vreg_update_bits(vreg, SPMI_COMMON_REG_VOLTAGE_SET, voltage_sel, 0xff); - if (ret) - return ret; - - return 0; } static int spmi_regulator_ult_lo_smps_get_voltage(struct regulator_dev *rdev)