diff options
| -rw-r--r-- | drivers/regulator/ab8500-ext.c | 4 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 9 | ||||
| -rw-r--r-- | include/linux/regulator/ab8500.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index 9aee21cad37..20680f30a96 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -394,7 +394,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) return 0; } -int ab8500_ext_regulator_exit(struct platform_device *pdev) +void ab8500_ext_regulator_exit(struct platform_device *pdev) { int i; @@ -407,8 +407,6 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev) regulator_unregister(info->rdev); } - - return 0; } MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 9ebd131b2ec..c200f8bb61d 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); diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 90b8b5ae9a4..7c5ff0c5577 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -338,6 +338,6 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev) /* AB8500 external regulator functions. */ int ab8500_ext_regulator_init(struct platform_device *pdev); -int ab8500_ext_regulator_exit(struct platform_device *pdev); +void ab8500_ext_regulator_exit(struct platform_device *pdev); #endif |