diff for duplicates of <1432533755.2957.0.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index d91f804..a99614f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,26 +1,38 @@ -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== +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; +> } +> diff --git a/a/content_digest b/N1/content_digest index ebd66f1..7a4ee90 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,43 +1,56 @@ "ref\01432428801-2458-1-git-send-email-xerofoify@gmail.com\0" - "From\0Grumbach, Emmanuel <emmanuel.grumbach@intel.com>\0" + "ref\01432428801-2458-1-git-send-email-xerofoify-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Grumbach, Emmanuel <emmanuel.grumbach-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get_regdomain\0" "Date\0Mon, 25 May 2015 06:02:35 +0000\0" - "To\0xerofoify@gmail.com <xerofoify@gmail.com>\0" + "To\0xerofoify-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org <xerofoify-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Cc\0Coelho" - Luciano <luciano.coelho@intel.com> - kvalo@codeaurora.org <kvalo@codeaurora.org> - netdev@vger.kernel.org <netdev@vger.kernel.org> - linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org> - ilw@linux.intel.com <ilw@linux.intel.com> + Luciano <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + ilw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org <ilw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Berg - " Johannes <johannes.berg@intel.com>\0" + " Johannes <johannes.berg-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" - "T24gU2F0LCAyMDE1LTA1LTIzIGF0IDIwOjUzIC0wNDAwLCBOaWNob2xhcyBLcmF1c2Ugd3JvdGU6\n" - "DQo+IFRoaXMgcmVtb3ZlcyB0aGUgdXNlIG9mIHRoZSB0d28gZGVwcmVjYXRlZCBjYWxscyB0byB0\n" - "aGUNCj4gbWFyY28sIFBUUl9SRVQgaW4gdGhlIGZ1bmN0aW9uLCBpd2xfbXZtX2dldF9yZWdkb21h\n" - "aW4NCj4gYW5kIHJlcGxhY2VzIHRoZW0gYm90aCB3aXRoIGEgY2FsbCB0byB0aGUgZnVuY3Rpb24s\n" - "DQo+IFBUUl9FUlJfT1JfWkVSTy4NCj4gDQo+IFNpZ25lZC1vZmYtYnk6IE5pY2hvbGFzIEtyYXVz\n" - "ZSA8eGVyb2ZvaWZ5QGdtYWlsLmNvbT4NCg0KQXBwbGllZCBpbiBvdXIgaW50ZXJuYWwgdHJlZSBh\n" - "ZnRlciBhIGZldyBmaXhlcyB0byB0aGUgY29tbWl0IG1lc3NhZ2UuDQpXaWxsIGJlIHB1c2hlZCBv\n" - "dXQgd2l0aCB0aGUgcmVndWxhciBwcm9jZXNzLg0KVGhhbmtzLg0KDQo+IC0tLQ0KPiAgZHJpdmVy\n" - "cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbWFjODAyMTEuYyB8IDQgKystLQ0KPiAgMSBmaWxl\n" - "IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1n\n" - "aXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9tYWM4MDIxMS5jIGIvZHJpdmVy\n" - "cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbWFjODAyMTEuYw0KPiBpbmRleCA0MDI2NWI5Li41\n" - "ZmIyZThlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9t\n" - "YWM4MDIxMS5jDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL21hYzgw\n" - "MjExLmMNCj4gQEAgLTMxOSw3ICszMTksNyBAQCBzdHJ1Y3QgaWVlZTgwMjExX3JlZ2RvbWFpbiAq\n" - "aXdsX212bV9nZXRfcmVnZG9tYWluKHN0cnVjdCB3aXBoeSAqd2lwaHksDQo+ICAJcmVzcCA9IGl3\n" - "bF9tdm1fdXBkYXRlX21jYyhtdm0sIGFscGhhMiwgc3JjX2lkKTsNCj4gIAlpZiAoSVNfRVJSX09S\n" - "X05VTEwocmVzcCkpIHsNCj4gIAkJSVdMX0RFQlVHX0xBUihtdm0sICJDb3VsZCBub3QgZ2V0IHVw\n" - "ZGF0ZSBmcm9tIEZXICVkXG4iLA0KPiAtCQkJICAgICAgUFRSX1JFVChyZXNwKSk7DQo+ICsJCQkg\n" - "ICAgICBQVFJfRVJSX09SX1pFUk8ocmVzcCkpOw0KPiAgCQlnb3RvIG91dDsNCj4gIAl9DQo+ICAN\n" - "Cj4gQEAgLTMzNSw3ICszMzUsNyBAQCBzdHJ1Y3QgaWVlZTgwMjExX3JlZ2RvbWFpbiAqaXdsX212\n" - "bV9nZXRfcmVnZG9tYWluKHN0cnVjdCB3aXBoeSAqd2lwaHksDQo+ICAJa2ZyZWUocmVzcCk7DQo+\n" - "ICAJaWYgKElTX0VSUl9PUl9OVUxMKHJlZ2QpKSB7DQo+ICAJCUlXTF9ERUJVR19MQVIobXZtLCAi\n" - "Q291bGQgbm90IGdldCBwYXJzZSB1cGRhdGUgZnJvbSBGVyAlZFxuIiwNCj4gLQkJCSAgICAgIFBU\n" - "Ul9SRVQocmVnZCkpOw0KPiArCQkJICAgICAgUFRSX0VSUl9PUl9aRVJPKHJlZ2QpKTsNCj4gIAkJ\n" - Z290byBvdXQ7DQo+ICAJfQ0KPiAgDQoNCg== + "On Sat, 2015-05-23 at 20:53 -0400, Nicholas Krause wrote:\n" + "> This removes the use of the two deprecated calls to the\n" + "> marco, PTR_RET in the function, iwl_mvm_get_regdomain\n" + "> and replaces them both with a call to the function,\n" + "> PTR_ERR_OR_ZERO.\n" + "> \n" + "> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>\n" + "\n" + "Applied in our internal tree after a few fixes to the commit message.\n" + "Will be pushed out with the regular process.\n" + "Thanks.\n" + "\n" + "> ---\n" + "> drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++--\n" + "> 1 file changed, 2 insertions(+), 2 deletions(-)\n" + "> \n" + "> diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c\n" + "> index 40265b9..5fb2e8e 100644\n" + "> --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c\n" + "> +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c\n" + "> @@ -319,7 +319,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,\n" + "> \tresp = iwl_mvm_update_mcc(mvm, alpha2, src_id);\n" + "> \tif (IS_ERR_OR_NULL(resp)) {\n" + "> \t\tIWL_DEBUG_LAR(mvm, \"Could not get update from FW %d\\n\",\n" + "> -\t\t\t PTR_RET(resp));\n" + "> +\t\t\t PTR_ERR_OR_ZERO(resp));\n" + "> \t\tgoto out;\n" + "> \t}\n" + "> \n" + "> @@ -335,7 +335,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,\n" + "> \tkfree(resp);\n" + "> \tif (IS_ERR_OR_NULL(regd)) {\n" + "> \t\tIWL_DEBUG_LAR(mvm, \"Could not get parse update from FW %d\\n\",\n" + "> -\t\t\t PTR_RET(regd));\n" + "> +\t\t\t PTR_ERR_OR_ZERO(regd));\n" + "> \t\tgoto out;\n" + "> \t}\n" + > -2727ea1e72a79fdc9ae045f96780754ba610a7a9335fd1d3ec937b6154f4a9cd +087c98676cf9b3e0b409c0b276a0bf523548d1032f5aa0437fa8acf8f88b4de1
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.