| Message ID | 1393422280-22283-4-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | Accepted |
| Commit | 110666dc655a142bc693ffa61de8eef82c0a8a98 |
| Headers | show
Return-Path: <patchwork-forward+bncBCV3TM5A74DRBHHAW6MAKGQEUEGI5HI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43D1B20636 for <linaro@patches.linaro.org>; Wed, 26 Feb 2014 13:46:05 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id o6sf3110206oag.6 for <linaro@patches.linaro.org>; Wed, 26 Feb 2014 05:46:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=t3WFJWnhYc/cGFnTcKAfYwjD4QXPNIPSZGW7cfl6B20=; b=VVyTqSQ3wx6JsmfbAU4C5TeAfBzV1VxuRgZt5vrgywg1ePXsTTSlTzILGBUN/R170t jfIIpt7ddrXruiNyxAW7HT0mS27D/Hd1hgtVTHCAJ5Tmg54qVcU6Wb5JxZW0xDmAhkIj N8+uyyLyqzRpHug3scyOxgK9e3f7cJRQF7n8vJoQbIAyuxeTo4h9y7J6h/CZc8r19wdt y/sY5oRZrRaK8pZNjrMdbL4Iun5yFN0IY/dg5zPKcylMGRGyfShtQ8br54Qv+0pMnDrH iIu+WOH+32iRfL510rnaf1wmX9wVIMWYM0gex05oGVStCsHj2zRsCg4ZDZL2SFihBRgY oIUw== X-Gm-Message-State: ALoCoQkekH+g8gahImsNavf5AsA4GX+HEH1+4Ntnf255A7XMQ0nB6KWxud5Tt+HAdj2kp2/FvJEv X-Received: by 10.182.28.67 with SMTP id z3mr1430737obg.12.1393422364671; Wed, 26 Feb 2014 05:46:04 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.119 with SMTP id h110ls235143qge.54.gmail; Wed, 26 Feb 2014 05:46:04 -0800 (PST) X-Received: by 10.220.110.210 with SMTP id o18mr85722vcp.49.1393422364552; Wed, 26 Feb 2014 05:46:04 -0800 (PST) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id si7si223200vdc.76.2014.02.26.05.46.04 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 05:46:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lg15so908453vcb.26 for <patchwork-forward@linaro.org>; Wed, 26 Feb 2014 05:46:04 -0800 (PST) X-Received: by 10.220.162.196 with SMTP id w4mr79217vcx.58.1393422364438; Wed, 26 Feb 2014 05:46:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp26646vcz; Wed, 26 Feb 2014 05:46:03 -0800 (PST) X-Received: by 10.194.108.162 with SMTP id hl2mr252238wjb.84.1393422363428; Wed, 26 Feb 2014 05:46:03 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id x1si1243805wie.77.2014.02.26.05.46.02 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Feb 2014 05:46:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIenF-0002iS-Ft; Wed, 26 Feb 2014 13:45:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIen7-0007Nk-JF; Wed, 26 Feb 2014 13:44:53 +0000 Received: from co9ehsobe003.messaging.microsoft.com ([207.46.163.26] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIemw-0007Ko-2M for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2014 13:44:44 +0000 Received: from mail60-co9-R.bigfish.com (10.236.132.249) by CO9EHSOBE028.bigfish.com (10.236.130.91) with Microsoft SMTP Server id 14.1.225.22; Wed, 26 Feb 2014 13:44:20 +0000 Received: from mail60-co9 (localhost [127.0.0.1]) by mail60-co9-R.bigfish.com (Postfix) with ESMTP id 432DDB80316; Wed, 26 Feb 2014 13:44:20 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zze0eahzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275dh1de097hz2dh87h2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail60-co9 (localhost.localdomain [127.0.0.1]) by mail60-co9 (MessageSwitch) id 1393422257411865_17059; Wed, 26 Feb 2014 13:44:17 +0000 (UTC) Received: from CO9EHSMHS013.bigfish.com (unknown [10.236.132.250]) by mail60-co9.bigfish.com (Postfix) with ESMTP id 5FB2488004A; Wed, 26 Feb 2014 13:44:17 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS013.bigfish.com (10.236.130.23) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 26 Feb 2014 13:44:17 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 26 Feb 2014 13:44:11 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.98]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s1QDi3TS008570; Wed, 26 Feb 2014 06:44:09 -0700 From: Shawn Guo <shawn.guo@linaro.org> 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 Message-ID: <1393422280-22283-4-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> References: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140226_084442_250887_35CCCA82 X-CRM114-Status: GOOD ( 10.12 ) X-Spam-Score: -3.5 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.26 listed in list.dnswl.org] 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo <shawn.guo@linaro.org>, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
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
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(-)