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: 24542 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A8A8A20143 for ; Wed, 12 Feb 2014 12:59:46 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id w20sf19710047vbb.11 for ; Wed, 12 Feb 2014 04:59:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=n95xOo5Nr725c4CPpU3Lyj1oIhDXah4ttUuOpBhlRoE=; b=LSsUQluACWkxnkP48O3atn5YeJbWMBJuJkxLSg8N/fp/rIMj4HzX/tmVNua1R8Jcvu JfCcTzm0b4Ywzg1Bbi9ow4bhnGWGdlAfkMuVbHbnZ3KCBmdY/om1n3p0p9Ov7x7mXgbV Oosgl8zHw0HYunIT7x9W+6H0Mbf+SF5KIVfyfQ2ArKBGezqfvcpHs/k8KWsNlcDvkUDL bwA/WMxKM2jg3f9alAj+eXIMgdIwoDD7vS9gRBZ/0Yijv8PdwGuTF+5zRoN0ZK8s3u0K 0Hy/r3NQNJwfO29YwR/vIRyKju0JeC6X30BKn4znPHfvyMvxPSaCgficbparOnNvxAma dIpg== X-Gm-Message-State: ALoCoQleY9gTR2txZUTz/biiTN9BZ9OEJ87VSq5n/i2IRtoMeNoJQ3u416bo1hYSHWDESHo4ytgx X-Received: by 10.52.53.73 with SMTP id z9mr1431229vdo.4.1392209985781; Wed, 12 Feb 2014 04:59:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.40 with SMTP id 37ls2898906qgu.46.gmail; Wed, 12 Feb 2014 04:59:45 -0800 (PST) X-Received: by 10.220.159.4 with SMTP id h4mr33364933vcx.1.1392209985586; Wed, 12 Feb 2014 04:59:45 -0800 (PST) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id tj7si7249683vdc.46.2014.02.12.04.59.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 04:59:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id w8so6935436vbj.37 for ; Wed, 12 Feb 2014 04:59:45 -0800 (PST) X-Received: by 10.52.246.133 with SMTP id xw5mr916144vdc.32.1392209985511; Wed, 12 Feb 2014 04:59:45 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp34441vcz; Wed, 12 Feb 2014 04:59:45 -0800 (PST) X-Received: by 10.194.143.40 with SMTP id sb8mr29761711wjb.15.1392209983475; Wed, 12 Feb 2014 04:59:43 -0800 (PST) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by mx.google.com with ESMTPS id bj10si11198498wjb.141.2014.02.12.04.59.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 04:59:43 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.179 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.179; Received: by mail-we0-f179.google.com with SMTP id q58so5970194wes.10 for ; Wed, 12 Feb 2014 04:59:43 -0800 (PST) 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 Cc: Ulf Hansson 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.50 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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