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>
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 0f32f10..d071d85 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -111,6 +111,21 @@
{
}
+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 @@
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 */