Commit ff73ceed authored by Linus Walleij's avatar Linus Walleij

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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c8587eee
...@@ -111,6 +111,21 @@ static inline void devm_pinctrl_put(struct pinctrl *p) ...@@ -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 */ #endif /* CONFIG_PINCTRL */
static inline struct pinctrl * __must_check pinctrl_get_select( static inline struct pinctrl * __must_check pinctrl_get_select(
...@@ -218,21 +233,6 @@ static inline int pin_config_group_set(const char *dev_name, ...@@ -218,21 +233,6 @@ static inline int pin_config_group_set(const char *dev_name,
return 0; 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
#endif /* __LINUX_PINCTRL_CONSUMER_H */ #endif /* __LINUX_PINCTRL_CONSUMER_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment