From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 13 Jun 2013 20:27:59 +0000 (+0200)
Subject: pinctrl: move the pm state stubs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff73ceed0b5a046468de20d3b014a8c59051f90a;p=linux-beck.git

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 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 */