regulator: core: Change suspend_late to suspend

Change suspend_late ops to suspend normal ops. The goal is to avoid
requesting all the regulator drivers to be operational in suspend late
phase.

Signed-off-by: pascal paillet <p.paillet@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 6ed568b96c0ec1edf77cc2b4059c36d51b58cb93..da9b0fed8330a8e45aac03cc6a4a844eb18d44d6 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4441,7 +4441,7 @@ void regulator_unregister(struct regulator_dev *rdev)
 EXPORT_SYMBOL_GPL(regulator_unregister);
 
 #ifdef CONFIG_SUSPEND
-static int _regulator_suspend_late(struct device *dev, void *data)
+static int _regulator_suspend(struct device *dev, void *data)
 {
        struct regulator_dev *rdev = dev_to_rdev(dev);
        suspend_state_t *state = data;
@@ -4455,20 +4455,20 @@ static int _regulator_suspend_late(struct device *dev, void *data)
 }
 
 /**
- * regulator_suspend_late - prepare regulators for system wide suspend
+ * regulator_suspend - prepare regulators for system wide suspend
  * @state: system suspend state
  *
  * Configure each regulator with it's suspend operating parameters for state.
  */
-static int regulator_suspend_late(struct device *dev)
+static int regulator_suspend(struct device *dev)
 {
        suspend_state_t state = pm_suspend_target_state;
 
        return class_for_each_device(&regulator_class, NULL, &state,
-                                    _regulator_suspend_late);
+                                    _regulator_suspend);
 }
 
-static int _regulator_resume_early(struct device *dev, void *data)
+static int _regulator_resume(struct device *dev, void *data)
 {
        int ret = 0;
        struct regulator_dev *rdev = dev_to_rdev(dev);
@@ -4481,35 +4481,35 @@ static int _regulator_resume_early(struct device *dev, void *data)
 
        regulator_lock(rdev);
 
-       if (rdev->desc->ops->resume_early &&
+       if (rdev->desc->ops->resume &&
            (rstate->enabled == ENABLE_IN_SUSPEND ||
             rstate->enabled == DISABLE_IN_SUSPEND))
-               ret = rdev->desc->ops->resume_early(rdev);
+               ret = rdev->desc->ops->resume(rdev);
 
        regulator_unlock(rdev);
 
        return ret;
 }
 
-static int regulator_resume_early(struct device *dev)
+static int regulator_resume(struct device *dev)
 {
        suspend_state_t state = pm_suspend_target_state;
 
        return class_for_each_device(&regulator_class, NULL, &state,
-                                    _regulator_resume_early);
+                                    _regulator_resume);
 }
 
 #else /* !CONFIG_SUSPEND */
 
-#define regulator_suspend_late NULL
-#define regulator_resume_early NULL
+#define regulator_suspend      NULL
+#define regulator_resume       NULL
 
 #endif /* !CONFIG_SUSPEND */
 
 #ifdef CONFIG_PM
 static const struct dev_pm_ops __maybe_unused regulator_pm_ops = {
-       .suspend_late   = regulator_suspend_late,
-       .resume_early   = regulator_resume_early,
+       .suspend        = regulator_suspend,
+       .resume         = regulator_resume,
 };
 #endif
 

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index dea96ee39fdcf56d8a88af43c700eac73e277009..0fd8fbb74763e4be6cb80e9137921f9bb5339f37 100644 (file)
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -220,7 +220,7 @@ struct regulator_ops {
        /* set regulator suspend operating mode (defined in consumer.h) */
        int (*set_suspend_mode) (struct regulator_dev *, unsigned int mode);
 
-       int (*resume_early)(struct regulator_dev *rdev);
+       int (*resume)(struct regulator_dev *rdev);
 
        int (*set_pull_down) (struct regulator_dev *);
 };