From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [10/18] xhci: rename faked_port_index to hcd_portnum From: Mathias Nyman Message-Id: <1526910006-26104-11-git-send-email-mathias.nyman@linux.intel.com> Date: Mon, 21 May 2018 16:39:58 +0300 To: gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, Mathias Nyman List-ID: aGNkX3BvcnRudW0gaXMgYSBiZXR0ZXIgZGVzY3RpcHRpb24gdGhhbiBmYWtlZF9wb3J0X2luZGV4 LCBhbmQKaXMgaW4gbGluZSB3aXRoIHRoZSBuYW1lIHRoZSBwb3J0IHN0cnVjdHVyZSB1c2VzLgoK Tm8gZnVuY3Rpb25hbCBjaGFuZ2VzCgpTaWduZWQtb2ZmLWJ5OiBNYXRoaWFzIE55bWFuIDxtYXRo aWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktcmlu Zy5jIHwgNDEgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcmluZy5jIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLXJp bmcuYwppbmRleCA0ZDJkMGU4Li4zMWI3MjEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0 L3hoY2ktcmluZy5jCisrKyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1yaW5nLmMKQEAgLTE1MjUs NyArMTUyNSw3IEBAIHN0YXRpYyB2b2lkIGhhbmRsZV9wb3J0X3N0YXR1cyhzdHJ1Y3QgeGhjaV9o Y2QgKnhoY2ksCiAJdTMyIHBvcnRzYywgY21kX3JlZzsKIAlpbnQgbWF4X3BvcnRzOwogCWludCBz bG90X2lkOwotCXVuc2lnbmVkIGludCBmYWtlZF9wb3J0X2luZGV4OworCXVuc2lnbmVkIGludCBo Y2RfcG9ydG51bTsKIAlzdHJ1Y3QgeGhjaV9idXNfc3RhdGUgKmJ1c19zdGF0ZTsKIAlfX2xlMzIg X19pb21lbSAqKnBvcnRfYXJyYXk7CiAJYm9vbCBib2d1c19wb3J0X3N0YXR1cyA9IGZhbHNlOwpA QCAtMTU2MCwxMCArMTU2MCwxMCBAQCBzdGF0aWMgdm9pZCBoYW5kbGVfcG9ydF9zdGF0dXMoc3Ry dWN0IHhoY2lfaGNkICp4aGNpLAogCWVsc2UKIAkJcG9ydF9hcnJheSA9IHhoY2ktPnVzYjJfcG9y dHM7CiAKLQlmYWtlZF9wb3J0X2luZGV4ID0gcG9ydC0+aGNkX3BvcnRudW07CisJaGNkX3BvcnRu dW0gPSBwb3J0LT5oY2RfcG9ydG51bTsKIAlwb3J0c2MgPSByZWFkbChwb3J0LT5hZGRyKTsKIAot CXRyYWNlX3hoY2lfaGFuZGxlX3BvcnRfc3RhdHVzKGZha2VkX3BvcnRfaW5kZXgsIHBvcnRzYyk7 CisJdHJhY2VfeGhjaV9oYW5kbGVfcG9ydF9zdGF0dXMoaGNkX3BvcnRudW0sIHBvcnRzYyk7CiAK IAlpZiAoaGNkLT5zdGF0ZSA9PSBIQ19TVEFURV9TVVNQRU5ERUQpIHsKIAkJeGhjaV9kYmcoeGhj aSwgInJlc3VtZSByb290IGh1YlxuIik7CkBAIC0xNTcxLDcgKzE1NzEsNyBAQCBzdGF0aWMgdm9p ZCBoYW5kbGVfcG9ydF9zdGF0dXMoc3RydWN0IHhoY2lfaGNkICp4aGNpLAogCX0KIAogCWlmICho Y2QtPnNwZWVkID49IEhDRF9VU0IzICYmIChwb3J0c2MgJiBQT1JUX1BMU19NQVNLKSA9PSBYREVW X0lOQUNUSVZFKQotCQlidXNfc3RhdGUtPnBvcnRfcmVtb3RlX3dha2V1cCAmPSB+KDEgPDwgZmFr ZWRfcG9ydF9pbmRleCk7CisJCWJ1c19zdGF0ZS0+cG9ydF9yZW1vdGVfd2FrZXVwICY9IH4oMSA8 PCBoY2RfcG9ydG51bSk7CiAKIAlpZiAoKHBvcnRzYyAmIFBPUlRfUExDKSAmJiAocG9ydHNjICYg UE9SVF9QTFNfTUFTSykgPT0gWERFVl9SRVNVTUUpIHsKIAkJeGhjaV9kYmcoeGhjaSwgInBvcnQg cmVzdW1lIGV2ZW50IGZvciBwb3J0ICVkXG4iLCBwb3J0X2lkKTsKQEAgLTE1ODgsMjkgKzE1ODgs MjggQEAgc3RhdGljIHZvaWQgaGFuZGxlX3BvcnRfc3RhdHVzKHN0cnVjdCB4aGNpX2hjZCAqeGhj aSwKIAkJCSAqIHNvIHdlIGNhbiB0ZWxsIHRoZSBkaWZmZXJlbmNlIGJldHdlZW4gdGhlIGVuZCBv ZgogCQkJICogZGV2aWNlIGFuZCBob3N0IGluaXRpYXRlZCByZXN1bWUuCiAJCQkgKi8KLQkJCWJ1 c19zdGF0ZS0+cG9ydF9yZW1vdGVfd2FrZXVwIHw9IDEgPDwgZmFrZWRfcG9ydF9pbmRleDsKKwkJ CWJ1c19zdGF0ZS0+cG9ydF9yZW1vdGVfd2FrZXVwIHw9IDEgPDwgaGNkX3BvcnRudW07CiAJCQl4 aGNpX3Rlc3RfYW5kX2NsZWFyX2JpdCh4aGNpLCBwb3J0X2FycmF5LAotCQkJCQlmYWtlZF9wb3J0 X2luZGV4LCBQT1JUX1BMQyk7Ci0JCQl4aGNpX3NldF9saW5rX3N0YXRlKHhoY2ksIHBvcnRfYXJy YXksIGZha2VkX3BvcnRfaW5kZXgsCisJCQkJCWhjZF9wb3J0bnVtLCBQT1JUX1BMQyk7CisJCQl4 aGNpX3NldF9saW5rX3N0YXRlKHhoY2ksIHBvcnRfYXJyYXksIGhjZF9wb3J0bnVtLAogCQkJCQkJ WERFVl9VMCk7CiAJCQkvKiBOZWVkIHRvIHdhaXQgdW50aWwgdGhlIG5leHQgbGluayBzdGF0ZSBj aGFuZ2UKIAkJCSAqIGluZGljYXRlcyB0aGUgZGV2aWNlIGlzIGFjdHVhbGx5IGluIFUwLgogCQkJ ICovCiAJCQlib2d1c19wb3J0X3N0YXR1cyA9IHRydWU7CiAJCQlnb3RvIGNsZWFudXA7Ci0JCX0g ZWxzZSBpZiAoIXRlc3RfYml0KGZha2VkX3BvcnRfaW5kZXgsCi0JCQkJICAgICAmYnVzX3N0YXRl LT5yZXN1bWluZ19wb3J0cykpIHsKKwkJfSBlbHNlIGlmICghdGVzdF9iaXQoaGNkX3BvcnRudW0s ICZidXNfc3RhdGUtPnJlc3VtaW5nX3BvcnRzKSkgewogCQkJeGhjaV9kYmcoeGhjaSwgInJlc3Vt ZSBIUyBwb3J0ICVkXG4iLCBwb3J0X2lkKTsKLQkJCWJ1c19zdGF0ZS0+cmVzdW1lX2RvbmVbZmFr ZWRfcG9ydF9pbmRleF0gPSBqaWZmaWVzICsKKwkJCWJ1c19zdGF0ZS0+cmVzdW1lX2RvbmVbaGNk X3BvcnRudW1dID0gamlmZmllcyArCiAJCQkJbXNlY3NfdG9famlmZmllcyhVU0JfUkVTVU1FX1RJ TUVPVVQpOwotCQkJc2V0X2JpdChmYWtlZF9wb3J0X2luZGV4LCAmYnVzX3N0YXRlLT5yZXN1bWlu Z19wb3J0cyk7CisJCQlzZXRfYml0KGhjZF9wb3J0bnVtLCAmYnVzX3N0YXRlLT5yZXN1bWluZ19w b3J0cyk7CiAJCQkvKiBEbyB0aGUgcmVzdCBpbiBHZXRQb3J0U3RhdHVzIGFmdGVyIHJlc3VtZSB0 aW1lIGRlbGF5LgogCQkJICogQXZvaWQgcG9sbGluZyByb290aHViIHN0YXR1cyBiZWZvcmUgdGhh dCBzbyB0aGF0IGEKIAkJCSAqIHVzYiBkZXZpY2UgYXV0by1yZXN1bWUgbGF0ZW5jeSBhcm91bmQg fjQwbXMuCiAJCQkgKi8KIAkJCXNldF9iaXQoSENEX0ZMQUdfUE9MTF9SSCwgJmhjZC0+ZmxhZ3Mp OwogCQkJbW9kX3RpbWVyKCZoY2QtPnJoX3RpbWVyLAotCQkJCSAgYnVzX3N0YXRlLT5yZXN1bWVf ZG9uZVtmYWtlZF9wb3J0X2luZGV4XSk7CisJCQkJICBidXNfc3RhdGUtPnJlc3VtZV9kb25lW2hj ZF9wb3J0bnVtXSk7CiAJCQlib2d1c19wb3J0X3N0YXR1cyA9IHRydWU7CiAJCX0KIAl9CkBAIC0x NjI1LDE3ICsxNjI0LDE1IEBAIHN0YXRpYyB2b2lkIGhhbmRsZV9wb3J0X3N0YXR1cyhzdHJ1Y3Qg eGhjaV9oY2QgKnhoY2ksCiAJCSAqIHNvIHRoZSByb290aHViIGJlaGF2aW9yIGlzIGNvbnNpc3Rl bnQgd2l0aCBleHRlcm5hbAogCQkgKiBVU0IgMy4wIGh1YiBiZWhhdmlvci4KIAkJICovCi0JCXNs b3RfaWQgPSB4aGNpX2ZpbmRfc2xvdF9pZF9ieV9wb3J0KGhjZCwgeGhjaSwKLQkJCQlmYWtlZF9w b3J0X2luZGV4ICsgMSk7CisJCXNsb3RfaWQgPSB4aGNpX2ZpbmRfc2xvdF9pZF9ieV9wb3J0KGhj ZCwgeGhjaSwgaGNkX3BvcnRudW0gKyAxKTsKIAkJaWYgKHNsb3RfaWQgJiYgeGhjaS0+ZGV2c1tz bG90X2lkXSkKIAkJCXhoY2lfcmluZ19kZXZpY2UoeGhjaSwgc2xvdF9pZCk7Ci0JCWlmIChidXNf c3RhdGUtPnBvcnRfcmVtb3RlX3dha2V1cCAmICgxIDw8IGZha2VkX3BvcnRfaW5kZXgpKSB7Ci0J CQlidXNfc3RhdGUtPnBvcnRfcmVtb3RlX3dha2V1cCAmPQotCQkJCX4oMSA8PCBmYWtlZF9wb3J0 X2luZGV4KTsKKwkJaWYgKGJ1c19zdGF0ZS0+cG9ydF9yZW1vdGVfd2FrZXVwICYgKDEgPDwgaGNk X3BvcnRudW0pKSB7CisJCQlidXNfc3RhdGUtPnBvcnRfcmVtb3RlX3dha2V1cCAmPSB+KDEgPDwg aGNkX3BvcnRudW0pOwogCQkJeGhjaV90ZXN0X2FuZF9jbGVhcl9iaXQoeGhjaSwgcG9ydF9hcnJh eSwKLQkJCQkJZmFrZWRfcG9ydF9pbmRleCwgUE9SVF9QTEMpOworCQkJCQloY2RfcG9ydG51bSwg UE9SVF9QTEMpOwogCQkJdXNiX3dha2V1cF9ub3RpZmljYXRpb24oaGNkLT5zZWxmLnJvb3RfaHVi LAotCQkJCQlmYWtlZF9wb3J0X2luZGV4ICsgMSk7CisJCQkJCWhjZF9wb3J0bnVtICsgMSk7CiAJ CQlib2d1c19wb3J0X3N0YXR1cyA9IHRydWU7CiAJCQlnb3RvIGNsZWFudXA7CiAJCX0KQEAgLTE2 NDcsMTUgKzE2NDQsMTUgQEAgc3RhdGljIHZvaWQgaGFuZGxlX3BvcnRfc3RhdHVzKHN0cnVjdCB4 aGNpX2hjZCAqeGhjaSwKIAkgKiBvdXQgb2YgdGhlIFJFeGl0IHN0YXRlLgogCSAqLwogCWlmICgh REVWX1NVUEVSU1BFRURfQU5ZKHBvcnRzYykgJiYKLQkJCXRlc3RfYW5kX2NsZWFyX2JpdChmYWtl ZF9wb3J0X2luZGV4LAorCQkJdGVzdF9hbmRfY2xlYXJfYml0KGhjZF9wb3J0bnVtLAogCQkJCSZi dXNfc3RhdGUtPnJleGl0X3BvcnRzKSkgewotCQljb21wbGV0ZSgmYnVzX3N0YXRlLT5yZXhpdF9k b25lW2Zha2VkX3BvcnRfaW5kZXhdKTsKKwkJY29tcGxldGUoJmJ1c19zdGF0ZS0+cmV4aXRfZG9u ZVtoY2RfcG9ydG51bV0pOwogCQlib2d1c19wb3J0X3N0YXR1cyA9IHRydWU7CiAJCWdvdG8gY2xl YW51cDsKIAl9CiAKIAlpZiAoaGNkLT5zcGVlZCA8IEhDRF9VU0IzKQotCQl4aGNpX3Rlc3RfYW5k X2NsZWFyX2JpdCh4aGNpLCBwb3J0X2FycmF5LCBmYWtlZF9wb3J0X2luZGV4LAorCQl4aGNpX3Rl c3RfYW5kX2NsZWFyX2JpdCh4aGNpLCBwb3J0X2FycmF5LCBoY2RfcG9ydG51bSwKIAkJCQkJUE9S VF9QTEMpOwogCiBjbGVhbnVwOgo=