* Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get_regdomain @ 2015-05-25 6:02 ` Grumbach, Emmanuel 0 siblings, 0 replies; 2+ messages in thread From: Grumbach, Emmanuel @ 2015-05-25 6:02 UTC (permalink / raw) To: xerofoify@gmail.com Cc: Coelho, Luciano, kvalo@codeaurora.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ilw@linux.intel.com, Berg, Johannes T24gU2F0LCAyMDE1LTA1LTIzIGF0IDIwOjUzIC0wNDAwLCBOaWNob2xhcyBLcmF1c2Ugd3JvdGU6 DQo+IFRoaXMgcmVtb3ZlcyB0aGUgdXNlIG9mIHRoZSB0d28gZGVwcmVjYXRlZCBjYWxscyB0byB0 aGUNCj4gbWFyY28sIFBUUl9SRVQgaW4gdGhlIGZ1bmN0aW9uLCBpd2xfbXZtX2dldF9yZWdkb21h aW4NCj4gYW5kIHJlcGxhY2VzIHRoZW0gYm90aCB3aXRoIGEgY2FsbCB0byB0aGUgZnVuY3Rpb24s DQo+IFBUUl9FUlJfT1JfWkVSTy4NCj4gDQo+IFNpZ25lZC1vZmYtYnk6IE5pY2hvbGFzIEtyYXVz ZSA8eGVyb2ZvaWZ5QGdtYWlsLmNvbT4NCg0KQXBwbGllZCBpbiBvdXIgaW50ZXJuYWwgdHJlZSBh ZnRlciBhIGZldyBmaXhlcyB0byB0aGUgY29tbWl0IG1lc3NhZ2UuDQpXaWxsIGJlIHB1c2hlZCBv dXQgd2l0aCB0aGUgcmVndWxhciBwcm9jZXNzLg0KVGhhbmtzLg0KDQo+IC0tLQ0KPiAgZHJpdmVy cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbWFjODAyMTEuYyB8IDQgKystLQ0KPiAgMSBmaWxl IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9tYWM4MDIxMS5jIGIvZHJpdmVy cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbWFjODAyMTEuYw0KPiBpbmRleCA0MDI2NWI5Li41 ZmIyZThlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9t YWM4MDIxMS5jDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL21hYzgw MjExLmMNCj4gQEAgLTMxOSw3ICszMTksNyBAQCBzdHJ1Y3QgaWVlZTgwMjExX3JlZ2RvbWFpbiAq aXdsX212bV9nZXRfcmVnZG9tYWluKHN0cnVjdCB3aXBoeSAqd2lwaHksDQo+ICAJcmVzcCA9IGl3 bF9tdm1fdXBkYXRlX21jYyhtdm0sIGFscGhhMiwgc3JjX2lkKTsNCj4gIAlpZiAoSVNfRVJSX09S X05VTEwocmVzcCkpIHsNCj4gIAkJSVdMX0RFQlVHX0xBUihtdm0sICJDb3VsZCBub3QgZ2V0IHVw ZGF0ZSBmcm9tIEZXICVkXG4iLA0KPiAtCQkJICAgICAgUFRSX1JFVChyZXNwKSk7DQo+ICsJCQkg ICAgICBQVFJfRVJSX09SX1pFUk8ocmVzcCkpOw0KPiAgCQlnb3RvIG91dDsNCj4gIAl9DQo+ICAN Cj4gQEAgLTMzNSw3ICszMzUsNyBAQCBzdHJ1Y3QgaWVlZTgwMjExX3JlZ2RvbWFpbiAqaXdsX212 bV9nZXRfcmVnZG9tYWluKHN0cnVjdCB3aXBoeSAqd2lwaHksDQo+ICAJa2ZyZWUocmVzcCk7DQo+ ICAJaWYgKElTX0VSUl9PUl9OVUxMKHJlZ2QpKSB7DQo+ICAJCUlXTF9ERUJVR19MQVIobXZtLCAi Q291bGQgbm90IGdldCBwYXJzZSB1cGRhdGUgZnJvbSBGVyAlZFxuIiwNCj4gLQkJCSAgICAgIFBU Ul9SRVQocmVnZCkpOw0KPiArCQkJICAgICAgUFRSX0VSUl9PUl9aRVJPKHJlZ2QpKTsNCj4gIAkJ Z290byBvdXQ7DQo+ICAJfQ0KPiAgDQoNCg== ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get_regdomain @ 2015-05-25 6:02 ` Grumbach, Emmanuel 0 siblings, 0 replies; 2+ messages in thread From: Grumbach, Emmanuel @ 2015-05-25 6:02 UTC (permalink / raw) To: xerofoify-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Coelho, Luciano, kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ilw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, Berg, Johannes 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 <xerofoify@gmail.com> 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; > } > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-25 6:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1432428801-2458-1-git-send-email-xerofoify@gmail.com>
2015-05-25 6:02 ` [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get_regdomain Grumbach, Emmanuel
2015-05-25 6:02 ` Grumbach, Emmanuel
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.