From patchwork Wed Feb 12 12:59:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3637991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DB6639F369 for ; Wed, 12 Feb 2014 13:06:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1400B201EC for ; Wed, 12 Feb 2014 13:06:42 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1626C201CE for ; Wed, 12 Feb 2014 13:06:41 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDZWI-0002D8-Oo; Wed, 12 Feb 2014 13:06:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDZWG-0002LY-Al; Wed, 12 Feb 2014 13:06:28 +0000 Received: from mail-we0-f174.google.com ([74.125.82.174]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDZWD-0002Kp-Bg for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2014 13:06:25 +0000 Received: by mail-we0-f174.google.com with SMTP id w61so232962wes.33 for ; Wed, 12 Feb 2014 05:06:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=n95xOo5Nr725c4CPpU3Lyj1oIhDXah4ttUuOpBhlRoE=; b=RHAxPnXxFbTq1GxOtgKxhlSDcsxT8WqnUZrU92rUIC+nH6CvcE5O5eDK3HGaFriA1B ikVsziAMvny3bbpW5j0EE+Qm5+o/1bGYobgtElZkXgAD9mhrgT+CUGzvJVKWoLGgrvtz AuFB8jiHxa0pZLK0CShsvgbD80tjrFx9lPECTcc7udZHDzibBrAsYPIxpRzZDUHRaz6+ IfFtbUYcBm3+PbQ46jBcyc7xmT4nznPVngvwnNnuFgTZX5wMy5aDse7SHXxhsP5QO3Y3 bgKK96mLD5cJR/opJFQ4r2CjJf/orwQjZ5XLy2aKcUYXt8aeJ5qCcSsHecH8tjTkP2Np hGRQ== X-Gm-Message-State: ALoCoQnMetWWimOOVF+hKPdU97+Ksuy8EmSOupUXsM2e0uEkxOY7Ckx/rcz7pg0gFfaG6eF96sbQ X-Received: by 10.180.96.102 with SMTP id dr6mr1814235wib.19.1392209982839; Wed, 12 Feb 2014 04:59:42 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ea4sm5531838wib.7.2014.02.12.04.59.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 04:59:42 -0800 (PST) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Linus Walleij Subject: [PATCH 1/2] pinctrl: nomadik: Silence compiler warn for !CONFIG_PM Date: Wed, 12 Feb 2014 13:59:38 +0100 Message-Id: <1392209979-31636-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140212_080625_491640_31C230FF X-CRM114-Status: GOOD ( 10.93 ) X-Spam-Score: -2.6 (--) Cc: Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The static suspend/resume functions were not being used while !CONFIG_PM. Fix it and convert to CONFIG_PM_SLEEP. Signed-off-by: Ulf Hansson --- drivers/pinctrl/pinctrl-nomadik.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 53a1111..b6c5793 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -2035,6 +2035,7 @@ static const struct of_device_id nmk_pinctrl_match[] = { {}, }; +#ifdef CONFIG_PM_SLEEP static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) { struct nmk_pinctrl *npct; @@ -2056,6 +2057,7 @@ static int nmk_pinctrl_resume(struct platform_device *pdev) return pinctrl_force_default(npct->pctl); } +#endif static int nmk_pinctrl_probe(struct platform_device *pdev) { @@ -2151,7 +2153,7 @@ static struct platform_driver nmk_pinctrl_driver = { .of_match_table = nmk_pinctrl_match, }, .probe = nmk_pinctrl_probe, -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .suspend = nmk_pinctrl_suspend, .resume = nmk_pinctrl_resume, #endif