summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/ab8500.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-04-11 06:04:18 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-11 18:43:50 +0200
commit3480c0cab6e1a25fdeb63147b0b643b7825a36fb (patch)
treec7498b1852f3963495916873773adf96a93bd0c1 /drivers/regulator/ab8500.c
parentregulator: ab8500-ext: Remove get_voltage to avoid duplicate implementation (diff)
downloadlinux-3480c0cab6e1a25fdeb63147b0b643b7825a36fb.tar.xz
linux-3480c0cab6e1a25fdeb63147b0b643b7825a36fb.zip
regulator: ab8500-ext: Make the return type of ab8500_ext_regulator_exit() void
ab8500_ext_regulator_exit() never fails. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r--drivers/regulator/ab8500.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 9ebd131b2ec6..c200f8bb61db 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -3194,12 +3194,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
regulator_unregister(info->regulator);
}
- if (!is_ab8505(ab8500)) {
- /* remove external regulators (after Vaux1, 2 and 3) */
- err = ab8500_ext_regulator_exit(pdev);
- if (err)
- return err;
- }
+ /* remove external regulators (after Vaux1, 2 and 3) */
+ if (!is_ab8505(ab8500))
+ ab8500_ext_regulator_exit(pdev);
/* remove regulator debug */
err = ab8500_regulator_debug_exit(pdev);