summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonghwa Lee <jonghwa3.lee@samsung.com>2014-05-14 10:36:00 +0900
committerChanho Park <cometzero@review.tizen.org>2014-05-20 22:22:00 -0700
commit8644f1c42be8c2c7899b110bce4a76018e5f7b33 (patch)
tree1d8c4f87eb51a74ff002e6def1dad76245a64806
parentbc1372a6a7026ae72885bef236427660de5c53db (diff)
downloadlinux-3.10-8644f1c42be8c2c7899b110bce4a76018e5f7b33.tar.gz
linux-3.10-8644f1c42be8c2c7899b110bce4a76018e5f7b33.tar.bz2
linux-3.10-8644f1c42be8c2c7899b110bce4a76018e5f7b33.zip
Revert "regulator: Handle suspend and resume of regulators"
This reverts commit bdc1383dd59ea144e4acdb97c6077c09f371df78. I revert the commit because it is not merged to ML. Change-Id: I8c616af1429a4c53d263c99baa05d35e379635e5 Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
-rw-r--r--drivers/regulator/core.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 66877efc55f..a86d1232613 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3938,32 +3938,6 @@ static const struct file_operations supply_map_fops = {
#endif
};
-static int regulator_pm_notify(struct notifier_block *nb,
- unsigned long event, void *ptr)
-{
- int ret;
-
- switch (event) {
- case PM_SUSPEND_PREPARE:
- ret = regulator_suspend_prepare(PM_SUSPEND_MEM);
- break;
- case PM_HIBERNATION_PREPARE:
- ret = regulator_suspend_prepare(PM_SUSPEND_MAX);
- break;
- case PM_POST_SUSPEND:
- case PM_POST_HIBERNATION:
- ret = regulator_suspend_finish();
- break;
- default:
- return NOTIFY_DONE;
- }
-
- if (ret)
- return NOTIFY_BAD;
-
- return NOTIFY_OK;
-}
-
static int __init regulator_init(void)
{
int ret;
@@ -3979,8 +3953,6 @@ static int __init regulator_init(void)
regulator_dummy_init();
- pm_notifier(regulator_pm_notify, 0);
-
return ret;
}