redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

pinctrl: move the pm state stubs

Browse source 
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>
This commit is contained in:
Linus Walleij 2013-06-13 22:27:59 +02:00
parent c8587eeef8
commit ff73ceed0b
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/linux/pinctrl/consumer.h
View file

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