From patchwork Thu Jun 13 20:29:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17917 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0CA8A25BE0 for ; Thu, 13 Jun 2013 20:30:11 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id f14sf2401811qak.7 for ; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:mime-version:x-gm-message-state :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-google-group-id:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=x2mjveKzn6UJs42nxfDnGBCICf2WLLEW79hAfdntcLA=; b=FX9+SjRTAmU16M8JGSqOy5TMWL7vruGRNOxXT1J7JPEsG6RPzHMRtNtp/tLDv1u1AY zL8yaK72KiUhNmWEj8XVPUGhz/GTM4pbYrg+GlHSlUiOuE6hkcI28rOwhVTjf82mCw9m anhpRrQifBq7EmEHz/mBD0+8fk0l9D6BfOniCe/BoRc7iXcb6NnH9YR2QZC5RzOaLklF IIJ4pE+AOj5LUa4aIzC3RBdsXDrpSVoE6Ji2rGwuRJ6o18bclbM/02/XqsM3fcn0Y0ne tQRDxAJsAjcsdzQA7mwD5Qe7/XncR5ZuAeMx1hSBHirxXCtR95qpgVxDYk8Qy4nAPnzL hIfA== X-Received: by 10.236.138.20 with SMTP id z20mr1184838yhi.31.1371155410765; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.103.132 with SMTP id fw4ls4225105qeb.17.gmail; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) X-Received: by 10.220.191.129 with SMTP id dm1mr1072353vcb.54.1371155410569; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id p20si11234416veh.12.2013.06.13.13.30.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 13:30:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id hr11so7402042vcb.6 for ; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) X-Received: by 10.220.53.7 with SMTP id k7mr1061850vcg.52.1371155410305; Thu, 13 Jun 2013 13:30:10 -0700 (PDT) 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.58.191.99 with SMTP id gx3csp37108vec; Thu, 13 Jun 2013 13:30:09 -0700 (PDT) X-Received: by 10.15.86.74 with SMTP id h50mr3013194eez.97.1371155409267; Thu, 13 Jun 2013 13:30:09 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) by mx.google.com with SMTP id q6si19964177eew.354.2013.06.13.13.29.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Jun 2013 13:30:08 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.129; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUbortIGuCIzUAsaS+DuUn2bfsoZ0R8Fh@postini.com; Thu, 13 Jun 2013 20:30:08 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 695E950; Thu, 13 Jun 2013 20:28:25 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id DCF9B57; Thu, 13 Jun 2013 20:29:25 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 6247EA8074; Thu, 13 Jun 2013 22:29:17 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 13 Jun 2013 22:29:25 +0200 From: Linus Walleij To: , Cc: Stephen Warren , Anmar Oueja , Linus Walleij Subject: [PATCH] pinctrl: move the pm state stubs Date: Thu, 13 Jun 2013 22:29:23 +0200 Message-ID: <1371155363-28223-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQl90zwJRhC+/001gg/QLoo0yTPUU4QTYCh+FDYAA/MJVI5NtSQZfE8VSHJ61dPfR4csO9xe X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 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: , From: Linus Walleij The stubs for the !PINCTRL case were placed in the wrong part of the file, causing breakage in linux-next when compiling SH without pinctrl. Fix it up by moving the stubs to the right place. Signed-off-by: Linus Walleij --- include/linux/pinctrl/consumer.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 18cdbb1..7f18e4d 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -116,6 +116,26 @@ static inline void devm_pinctrl_put(struct pinctrl *p) { } +static inline int pinctrl_pm_select_default_state(struct device *dev) +{ + return 0; +} + +static inline int pinctrl_pm_select_active_state(struct device *dev) +{ + return 0; +} + +static inline int pinctrl_pm_select_sleep_state(struct device *dev) +{ + return 0; +} + +static inline int pinctrl_pm_select_idle_state(struct device *dev) +{ + return 0; +} + #endif /* CONFIG_PINCTRL */ static inline struct pinctrl * __must_check pinctrl_get_select( @@ -223,26 +243,6 @@ static inline int pin_config_group_set(const char *dev_name, return 0; } -static inline int pinctrl_pm_select_default_state(struct device *dev) -{ - return 0; -} - -static inline int pinctrl_pm_select_active_state(struct device *dev) -{ - return 0; -} - -static inline int pinctrl_pm_select_sleep_state(struct device *dev) -{ - return 0; -} - -static inline int pinctrl_pm_select_idle_state(struct device *dev) -{ - return 0; -} - #endif #endif /* __LINUX_PINCTRL_CONSUMER_H */