mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 08:34:20 +08:00
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:
parent
e343ab08bd
commit
3480c0cab6
@ -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");
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user