From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND
Date: Wed, 26 Feb 2014 21:44:40 +0800 [thread overview]
Message-ID: <1393422280-22283-4-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org>
When CONFIG_SUSPEND is not enabled, we should reasonably skip the call
to imx6q_suspend_init().
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/pm-imx6q.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c
index 2473ad4..16f0d24 100644
--- a/arch/arm/mach-imx/pm-imx6q.c
+++ b/arch/arm/mach-imx/pm-imx6q.c
@@ -516,10 +516,12 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
WARN_ON(!ccm_base);
- ret = imx6q_suspend_init(socdata);
- if (ret)
- pr_warn("%s: No DDR LPM support with suspend %d!\n",
- __func__, ret);
+ if (IS_ENABLED(CONFIG_SUSPEND)) {
+ ret = imx6q_suspend_init(socdata);
+ if (ret)
+ pr_warn("%s: No DDR LPM support with suspend %d!\n",
+ __func__, ret);
+ }
/*
* This is for SW workaround step #1 of ERR007265, see comments
--
1.7.9.5
next prev parent reply other threads:[~2014-02-26 13:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 13:44 [PATCH 1/4] ARM: imx6: move v7_cpu_resume() into suspend-imx6.S Shawn Guo
2014-02-26 13:44 ` [PATCH 2/4] ARM: imx6: build headsmp.o only on CONFIG_SMP Shawn Guo
2014-02-26 21:00 ` Russell King - ARM Linux
2014-02-27 8:24 ` Shawn Guo
2014-02-26 13:44 ` [PATCH 3/4] ARM: imx6: call suspend_set_ops() from suspend routine Shawn Guo
2014-02-26 13:44 ` Shawn Guo [this message]
2014-02-27 12:59 ` [PATCH 1/4] ARM: imx6: move v7_cpu_resume() into suspend-imx6.S Arnd Bergmann
2014-02-27 13:12 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393422280-22283-4-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).