summaryrefslogtreecommitdiff
path: root/include/linux/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-06-14 00:27:59 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 20:18:28 +0400
commitff73ceed0b5a046468de20d3b014a8c59051f90a (patch)
tree1636ab097a2e26107a8bb5ee4fab8b13ef9cea3c /include/linux/pinctrl
parentc8587eeef8fc219e806e868c6f0c7170c769efab (diff)
downloadlinux-ff73ceed0b5a046468de20d3b014a8c59051f90a.tar.xz
pinctrl: move the pm state stubs
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 <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/pinctrl')
-rw-r--r--include/linux/pinctrl/consumer.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 0f32f10e347d..d071d850d1de 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -111,6 +111,21 @@ 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_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(
@@ -218,21 +233,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_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 */