mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Axel Lin 2013-04-11 12:04:18 +08:00 committed by Mark Brown
parent e343ab08bd
commit 3480c0cab6
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/ab8500-ext.c
View File

@ -394,7 +394,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
return 0; return 0;
} }
int ab8500_ext_regulator_exit(struct platform_device *pdev) void ab8500_ext_regulator_exit(struct platform_device *pdev)
{ {
int i; int i;
@ -407,8 +407,6 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev)
regulator_unregister(info->rdev); regulator_unregister(info->rdev);
} }
return 0;
} }
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

9
drivers/regulator/ab8500.c
View File

@ -3194,12 +3194,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
regulator_unregister(info->regulator); regulator_unregister(info->regulator);
} }
if (!is_ab8505(ab8500)) { /* remove external regulators (after Vaux1, 2 and 3) */
/* remove external regulators (after Vaux1, 2 and 3) */ if (!is_ab8505(ab8500))
err = ab8500_ext_regulator_exit(pdev); ab8500_ext_regulator_exit(pdev);
if (err)
return err;
}
/* remove regulator debug */ /* remove regulator debug */
err = ab8500_regulator_debug_exit(pdev); err = ab8500_regulator_debug_exit(pdev);

2
include/linux/regulator/ab8500.h
View File

@ -338,6 +338,6 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
/* AB8500 external regulator functions. */ /* AB8500 external regulator functions. */
int ab8500_ext_regulator_init(struct platform_device *pdev); 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 #endif