summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-tegra.c
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-04-29 16:19:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:28 -0700
commit38a6276e2b56921a407e718079aee79919873d72 (patch)
tree105c46143f650432da4851e8aefeeb3ad54cd3bc /drivers/rtc/rtc-tegra.c
parentcb72f60c17aea5f0bdd546420ebb16075d965f92 (diff)
downloadop-kernel-dev-38a6276e2b56921a407e718079aee79919873d72.zip
op-kernel-dev-38a6276e2b56921a407e718079aee79919873d72.tar.gz
drivers/rtc/rtc-tegra.c: protect suspend/resume callbacks with CONFIG_PM_SLEEP
CONFIG_PM doesn't actually enable any of the PM callbacks, it only allows to enable CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME. This means if CONFIG_PM is used to protect system sleep callbacks then it may end up unreferenced if only runtime PM is enabled. Hence protecting sleep callbacks with CONFIG_PM_SLEEP. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Cc: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-tegra.c')
-rw-r--r--drivers/rtc/rtc-tegra.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index 9447d65..916802a 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -390,7 +390,7 @@ static int __exit tegra_rtc_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int tegra_rtc_suspend(struct platform_device *pdev, pm_message_t state)
{
struct device *dev = &pdev->dev;
@@ -446,7 +446,7 @@ static struct platform_driver tegra_rtc_driver = {
.owner = THIS_MODULE,
.of_match_table = tegra_rtc_dt_match,
},
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
.suspend = tegra_rtc_suspend,
.resume = tegra_rtc_resume,
#endif
OpenPOWER on IntegriCloud