diff options
| author | Olof Johansson <olof@lixom.net> | 2017-03-21 17:30:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-03-21 17:30:51 -0700 |
| commit | 6014ce8559934580c919485fdc96b4d2d4b18c12 (patch) | |
| tree | 239d1159a48d61c88855c42e6721e9feac03b0c6 /include | |
| parent | 2b259300d2641101847e4ad9ad1723525ad9c476 (diff) | |
| parent | 0ca10b60ceeb5372da01798ca68c116ae45a6eb6 (diff) | |
Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes
Reset controller fixes for v4.11
Fix optional reset_control_get_stubs to return NULL and remove warnings
from reset_control_* stubs.
This fixes commit bb475230b8e5 ("reset: make optional functions really
optional"), which was merged in reset-for-4.11, and would cause consumer
drivers depending on the new behaviour of optional resets to fail probing
if RESET_CONTROLLER Kconfig option is disabled.
* tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux:
reset: fix optional reset_control_get stubs to return NULL
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reset.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index 86b4ed75359e..96fb139bdd08 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -31,31 +31,26 @@ static inline int device_reset_optional(struct device *dev) static inline int reset_control_reset(struct reset_control *rstc) { - WARN_ON(1); return 0; } static inline int reset_control_assert(struct reset_control *rstc) { - WARN_ON(1); return 0; } static inline int reset_control_deassert(struct reset_control *rstc) { - WARN_ON(1); return 0; } static inline int reset_control_status(struct reset_control *rstc) { - WARN_ON(1); return 0; } static inline void reset_control_put(struct reset_control *rstc) { - WARN_ON(1); } static inline int __must_check device_reset(struct device *dev) @@ -74,14 +69,14 @@ static inline struct reset_control *__of_reset_control_get( const char *id, int index, bool shared, bool optional) { - return ERR_PTR(-ENOTSUPP); + return optional ? NULL : ERR_PTR(-ENOTSUPP); } static inline struct reset_control *__devm_reset_control_get( struct device *dev, const char *id, int index, bool shared, bool optional) { - return ERR_PTR(-ENOTSUPP); + return optional ? NULL : ERR_PTR(-ENOTSUPP); } #endif /* CONFIG_RESET_CONTROLLER */ |