summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChunyan Zhang <zhang.chunyan@linaro.org>2018-01-26 21:08:46 +0800
committerMark Brown <broonie@kernel.org>2018-01-26 14:43:51 +0000
commitaa27bbc6c6c60227c096d515f55ffe6cdfef7d2b (patch)
tree95ae3585d1cef8bb267076af8073d5b0f30e0276 /include
parent72069f9957a11896e79e95c8b55ec815e97c2187 (diff)
downloadlinux-aa27bbc6c6c60227c096d515f55ffe6cdfef7d2b.tar.gz
linux-aa27bbc6c6c60227c096d515f55ffe6cdfef7d2b.tar.bz2
linux-aa27bbc6c6c60227c096d515f55ffe6cdfef7d2b.zip
regulator: empty the old suspend functions
Regualtor suspend/resume functions should only be called by PM suspend core via registering dev_pm_ops, and regulator devices should implement the callback functions. Thus, any regulator consumer shouldn't call the regulator suspend/resume functions directly. In order to avoid compile errors, two empty functions with the same name still be left for the time being. Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/machine.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index ce89c5548c89..c4a56df8931b 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -236,12 +236,12 @@ struct regulator_init_data {
#ifdef CONFIG_REGULATOR
void regulator_has_full_constraints(void);
-int regulator_suspend_prepare(suspend_state_t state);
-int regulator_suspend_finish(void);
#else
static inline void regulator_has_full_constraints(void)
{
}
+#endif
+
static inline int regulator_suspend_prepare(suspend_state_t state)
{
return 0;
@@ -250,6 +250,5 @@ static inline int regulator_suspend_finish(void)
{
return 0;
}
-#endif
#endif