Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [6/9] xhci: refactor xhci_urb_enqueue a bit with minor changes From: Mathias Nyman Message-Id: <1521210786-28347-7-git-send-email-mathias.nyman@linux.intel.com> Date: Fri, 16 Mar 2018 16:33:03 +0200 To: gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, Mathias Nyman List-ID: bWFrZSB0aGUgbG9jYWwgZXBfc3RhdGUgdmFyaWFibGUgYSBwb2ludGVyIHRvIHRoZSBhY3R1YWwg cmluZyBlcF9zdGF0ZS4KVGhpcyBhbGxvd3MgdXMgdG8gcmVhZCBmcmVzaCBlcF9zdGF0ZSB2YWx1 ZXMgZXZlcnkgdGltZSwgd2lsbCBiZSB1c2VmdWwKbGF0ZXIuCgpBbHNvIG1vdmUgdGhlIHN0cmVh bXMgY2hlY2sgb3V0IGZyb20gYnVsayBvbmx5IGNhc2UuIEV2ZW4gaWYgb25seQpidWxrIHRyYW5m ZXJzIGNhbiB1c2Ugc3RyZWFtcyB3ZSBzaG91bGRuJ3QgY29udGludWUgaWYgdGhvc2UgZmxhZ3MK YXJlIHNldC4gTWFpbiByZWFzb24gZm9yIHRoaXMgY2hhbmdlIGlzIHJlYWxseSBjb2RlIHJlYWRh YmlsaXR5IGFuZApncm91cGluZyBmdW5jdGlvbmFsaXR5CgpTaWduZWQtb2ZmLWJ5OiBNYXRoaWFz IE55bWFuIDxtYXRoaWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9o b3N0L3hoY2kuYyB8IDIwICsrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOSBp bnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9o b3N0L3hoY2kuYyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS5jCmluZGV4IDI1ZDRiNzQ4Li5mOWQ4 YTMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2kuYworKysgYi9kcml2ZXJzL3Vz Yi9ob3N0L3hoY2kuYwpAQCAtMTI4Nyw3ICsxMjg3LDggQEAgc3RhdGljIGludCB4aGNpX3VyYl9l bnF1ZXVlKHN0cnVjdCB1c2JfaGNkICpoY2QsIHN0cnVjdCB1cmIgKnVyYiwgZ2ZwX3QgbWVtX2Zs YWcKIAlzdHJ1Y3QgeGhjaV9oY2QgKnhoY2kgPSBoY2RfdG9feGhjaShoY2QpOwogCXVuc2lnbmVk IGxvbmcgZmxhZ3M7CiAJaW50IHJldCA9IDA7Ci0JdW5zaWduZWQgaW50IHNsb3RfaWQsIGVwX2lu ZGV4LCBlcF9zdGF0ZTsKKwl1bnNpZ25lZCBpbnQgc2xvdF9pZCwgZXBfaW5kZXg7CisJdW5zaWdu ZWQgaW50ICplcF9zdGF0ZTsKIAlzdHJ1Y3QgdXJiX3ByaXYJKnVyYl9wcml2OwogCWludCBudW1f dGRzOwogCkBAIC0xMjk3LDYgKzEyOTgsNyBAQCBzdGF0aWMgaW50IHhoY2lfdXJiX2VucXVldWUo c3RydWN0IHVzYl9oY2QgKmhjZCwgc3RydWN0IHVyYiAqdXJiLCBnZnBfdCBtZW1fZmxhZwogCiAJ c2xvdF9pZCA9IHVyYi0+ZGV2LT5zbG90X2lkOwogCWVwX2luZGV4ID0geGhjaV9nZXRfZW5kcG9p bnRfaW5kZXgoJnVyYi0+ZXAtPmRlc2MpOworCWVwX3N0YXRlID0gJnhoY2ktPmRldnNbc2xvdF9p ZF0tPmVwc1tlcF9pbmRleF0uZXBfc3RhdGU7CiAKIAlpZiAoIUhDRF9IV19BQ0NFU1NJQkxFKGhj ZCkpIHsKIAkJaWYgKCFpbl9pbnRlcnJ1cHQoKSkKQEAgLTEzNDgsNiArMTM1MCwxMiBAQCBzdGF0 aWMgaW50IHhoY2lfdXJiX2VucXVldWUoc3RydWN0IHVzYl9oY2QgKmhjZCwgc3RydWN0IHVyYiAq dXJiLCBnZnBfdCBtZW1fZmxhZwogCQlyZXQgPSAtRVNIVVRET1dOOwogCQlnb3RvIGZyZWVfcHJp djsKIAl9CisJaWYgKCplcF9zdGF0ZSAmIChFUF9HRVRUSU5HX1NUUkVBTVMgfCBFUF9HRVRUSU5H X05PX1NUUkVBTVMpKSB7CisJCXhoY2lfd2Fybih4aGNpLCAiV0FSTjogQ2FuJ3QgZW5xdWV1ZSBV UkIsIGVwIGluIHN0cmVhbXMgdHJhbnNpdGlvbiBzdGF0ZSAleFxuIiwKKwkJCSAgKmVwX3N0YXRl KTsKKwkJcmV0ID0gLUVJTlZBTDsKKwkJZ290byBmcmVlX3ByaXY7CisJfQogCiAJc3dpdGNoICh1 c2JfZW5kcG9pbnRfdHlwZSgmdXJiLT5lcC0+ZGVzYykpIHsKIApAQCAtMTM1NiwyMyArMTM2NCwx MyBAQCBzdGF0aWMgaW50IHhoY2lfdXJiX2VucXVldWUoc3RydWN0IHVzYl9oY2QgKmhjZCwgc3Ry dWN0IHVyYiAqdXJiLCBnZnBfdCBtZW1fZmxhZwogCQkJCQkgc2xvdF9pZCwgZXBfaW5kZXgpOwog CQlicmVhazsKIAljYXNlIFVTQl9FTkRQT0lOVF9YRkVSX0JVTEs6Ci0JCWVwX3N0YXRlID0geGhj aS0+ZGV2c1tzbG90X2lkXS0+ZXBzW2VwX2luZGV4XS5lcF9zdGF0ZTsKLQkJaWYgKGVwX3N0YXRl ICYgKEVQX0dFVFRJTkdfU1RSRUFNUyB8IEVQX0dFVFRJTkdfTk9fU1RSRUFNUykpIHsKLQkJCXho Y2lfd2Fybih4aGNpLCAiV0FSTjogQ2FuJ3QgZW5xdWV1ZSBVUkIsIGVwIGluIHN0cmVhbXMgdHJh bnNpdGlvbiBzdGF0ZSAleFxuIiwKLQkJCQkgIGVwX3N0YXRlKTsKLQkJCXJldCA9IC1FSU5WQUw7 Ci0JCQlicmVhazsKLQkJfQogCQlyZXQgPSB4aGNpX3F1ZXVlX2J1bGtfdHgoeGhjaSwgR0ZQX0FU T01JQywgdXJiLAogCQkJCQkgc2xvdF9pZCwgZXBfaW5kZXgpOwogCQlicmVhazsKLQotCiAJY2Fz ZSBVU0JfRU5EUE9JTlRfWEZFUl9JTlQ6CiAJCXJldCA9IHhoY2lfcXVldWVfaW50cl90eCh4aGNp LCBHRlBfQVRPTUlDLCB1cmIsCiAJCQkJc2xvdF9pZCwgZXBfaW5kZXgpOwogCQlicmVhazsKLQog CWNhc2UgVVNCX0VORFBPSU5UX1hGRVJfSVNPQzoKIAkJcmV0ID0geGhjaV9xdWV1ZV9pc29jX3R4 X3ByZXBhcmUoeGhjaSwgR0ZQX0FUT01JQywgdXJiLAogCQkJCXNsb3RfaWQsIGVwX2luZGV4KTsK