Subject: Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get_regdomain

From: "Grumbach, Emmanuel" <[email-masked]>
Date: Mon, 25 May 2015 06:02:35 +0000

On Sat, 2015-05-23 at 20:53 -0400, Nicholas Krause wrote:
> This removes the use of the two deprecated calls to the
> marco, PTR_RET in the function, iwl_mvm_get_regdomain
> and replaces them both with a call to the function,
> PTR_ERR_OR_ZERO.
> 
> Signed-off-by: Nicholas Krause <[email-masked]>

Applied in our internal tree after a few fixes to the commit message.
Will be pushed out with the regular process.
Thanks.

> ---
>  drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> index 40265b9..5fb2e8e 100644
> --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> @@ -319,7 +319,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
>  	resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);
>  	if (IS_ERR_OR_NULL(resp)) {
>  		IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",
> -			      PTR_RET(resp));
> +			      PTR_ERR_OR_ZERO(resp));
>  		goto out;
>  	}
>  
> @@ -335,7 +335,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
>  	kfree(resp);
>  	if (IS_ERR_OR_NULL(regd)) {
>  		IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",
> -			      PTR_RET(regd));
> +			      PTR_ERR_OR_ZERO(regd));
>  		goto out;
>  	}
>  

�{.n�+�������+%��lzwm��b�맲��r��zX��"��^�ȧ���ܨ}���Ơz�&j:+v����n�r��6;靫3��\
nnX��f�z��2�ޙ���&�)ߡ�a�����G���h��j:+v���w�٥