leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: Remove use of the deprecacted PTR_RET

Browse Source 
This removes the use of the two deprecated calls to the
macro PTR_RET in iwl_mvm_get_regdomain and replaces them
both to PTR_ERR_OR_ZERO.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
[Commit message editing]
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Nicholas Krause 2015-05-23 20:53:21 -04:00 committed by Emmanuel Grumbach
parent c779273b37
commit b8c474d9c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

@ -318,7 +318,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
resp = iwl_mvm_update_mcc(mvm, alpha2, src_id); resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);
if (IS_ERR_OR_NULL(resp)) { if (IS_ERR_OR_NULL(resp)) {
IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n", IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",
PTR_RET(resp)); PTR_ERR_OR_ZERO(resp));
goto out; goto out;
} }
@ -334,7 +334,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
kfree(resp); kfree(resp);
if (IS_ERR_OR_NULL(regd)) { if (IS_ERR_OR_NULL(regd)) {
IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n", IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",
PTR_RET(regd)); PTR_ERR_OR_ZERO(regd));
goto out; goto out;
} }