4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Zabel p.zabel@pengutronix.de
commit 0ca10b60ceeb5372da01798ca68c116ae45a6eb6 upstream.
When RESET_CONTROLLER is not enabled, the optional reset_control_get stubs should now also return NULL.
Since it is now valid for reset_control_assert/deassert/reset/status/put to be called unconditionally, with NULL as an argument for optional resets, the stubs are not allowed to warn anymore.
Fixes: bb475230b8e5 ("reset: make optional functions really optional") Reported-by: Andrzej Hajda a.hajda@samsung.com Tested-by: Andrzej Hajda a.hajda@samsung.com Reviewed-by: Andrzej Hajda a.hajda@samsung.com Cc: Ramiro Oliveira Ramiro.Oliveira@synopsys.com Signed-off-by: Philipp Zabel p.zabel@pengutronix.de Cc: Dinh Nguyen dinguyen@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- include/linux/reset.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
--- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -31,31 +31,26 @@ static inline int device_reset_optional(
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 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 */