Re: [PATCH] reset: fix optional reset_control_get stubs to return NULL

[Andrzej Hajda]

On 20.03.2017 11:42, Philipp Zabel wrote:
> When RESET_CONTROLLER is not enabled, the optional reset_control_get
> stubs should now also return NULL.
>
> Fixes: bb475230b8e5 ("reset: make optional functions really optional")
> Reported-by: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
> Cc: Ramiro Oliveira <Ramiro.Oliveira@xxxxxxxxxxxx>
> Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> ---
>  include/linux/reset.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/reset.h b/include/linux/reset.h
> index 86b4ed75359e8..c905ff1c21ec6 100644
> --- a/include/linux/reset.h
> +++ b/include/linux/reset.h
> @@ -74,14 +74,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 */


Such change should be accompanied with change of all other stub
functions to accept NULL reset_control without displaying WARNs.


Regards

Andrzej