diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-06-08 10:47:10 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-22 06:51:47 -0400 |
commit | 03187c72db60e20354aca6802bc5cc3e42c1d6e1 (patch) | |
tree | 5c56db40d1a1e8fe9bfc7dec8e6c7f872690d146 | |
parent | a5c1a416013b04b66c721af2e90c04dce604d0b2 (diff) |
regulator: ab8500: Remove ab8500_regulator_debug_init/exit()
CONFIG_REGULATOR_AB8500_DEBUG is always not defined.
ab8500_regulator_debug_init() is not called at all now,
ab8500_regulator_debug_exit() simply return 0, thus remove them.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/regulator/ab8500.c | 13 | ||||
-rw-r--r-- | include/linux/regulator/ab8500.h | 14 |
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 88da8626a57a..1fda14e12ea8 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -3071,21 +3071,8 @@ static int ab8500_regulator_probe(struct platform_device *pdev) | |||
3071 | return 0; | 3071 | return 0; |
3072 | } | 3072 | } |
3073 | 3073 | ||
3074 | static int ab8500_regulator_remove(struct platform_device *pdev) | ||
3075 | { | ||
3076 | int err; | ||
3077 | |||
3078 | /* remove regulator debug */ | ||
3079 | err = ab8500_regulator_debug_exit(pdev); | ||
3080 | if (err) | ||
3081 | return err; | ||
3082 | |||
3083 | return 0; | ||
3084 | } | ||
3085 | |||
3086 | static struct platform_driver ab8500_regulator_driver = { | 3074 | static struct platform_driver ab8500_regulator_driver = { |
3087 | .probe = ab8500_regulator_probe, | 3075 | .probe = ab8500_regulator_probe, |
3088 | .remove = ab8500_regulator_remove, | ||
3089 | .driver = { | 3076 | .driver = { |
3090 | .name = "ab8500-regulator", | 3077 | .name = "ab8500-regulator", |
3091 | .owner = THIS_MODULE, | 3078 | .owner = THIS_MODULE, |
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 75307447cef9..d8ecefaf63ca 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h | |||
@@ -322,18 +322,4 @@ struct ab8500_regulator_platform_data { | |||
322 | struct regulator_init_data *ext_regulator; | 322 | struct regulator_init_data *ext_regulator; |
323 | }; | 323 | }; |
324 | 324 | ||
325 | #ifdef CONFIG_REGULATOR_AB8500_DEBUG | ||
326 | int ab8500_regulator_debug_init(struct platform_device *pdev); | ||
327 | int ab8500_regulator_debug_exit(struct platform_device *pdev); | ||
328 | #else | ||
329 | static inline int ab8500_regulator_debug_init(struct platform_device *pdev) | ||
330 | { | ||
331 | return 0; | ||
332 | } | ||
333 | static inline int ab8500_regulator_debug_exit(struct platform_device *pdev) | ||
334 | { | ||
335 | return 0; | ||
336 | } | ||
337 | #endif | ||
338 | |||
339 | #endif | 325 | #endif |