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: [3/4] USB: serial: ftdi_sio: drop unnecessary urb_ variable prefixes From: Johan Hovold Message-Id: <20180518132550.21749-4-johan@kernel.org> Date: Fri, 18 May 2018 15:25:49 +0200 To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org List-ID: RHJvcCB1cmJfIHByZWZpeGVzIGZyb20gdmFsdWUgYW5kIGluZGV4IHZhcmlhYmxlcyB1c2VkIGlu IGNvbnRyb2wKcmVxdWVzdHMuCgpTaWduZWQtb2ZmLWJ5OiBKb2hhbiBIb3ZvbGQgPGpvaGFuQGtl cm5lbC5vcmc+Ci0tLQogZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvLmMgfCA4MyArKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlv bnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9m dGRpX3Npby5jIGIvZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvLmMKaW5kZXggMGQyNGRhMDNh NGEzLi4zZDdmMTgxZTdlMmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Np by5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5jCkBAIC01NCwxMCArNTQsOSBA QCBzdHJ1Y3QgZnRkaV9wcml2YXRlIHsKIAlpbnQgY3VzdG9tX2Rpdmlzb3I7CS8qIGN1c3RvbV9k aXZpc29yIGtsdWRnZSwgdGhpcyBpcyBmb3IKIAkJCQkgICBiYXVkX2Jhc2UgKGRpZmZlcmVudCBm cm9tIHdoYXQgZ29lcyB0byB0aGUKIAkJCQkgICBjaGlwISkgKi8KLQl1MTYgbGFzdF9zZXRfZGF0 YV91cmJfdmFsdWU7Ci0JCQkJLyogdGhlIGxhc3QgZGF0YSBzdGF0ZSBzZXQgLSBuZWVkZWQgZm9y IGRvaW5nCi0JCQkJICogYSBicmVhawotCQkJCSAqLworCXUxNiBsYXN0X3NldF9kYXRhX3ZhbHVl OyAvKiB0aGUgbGFzdCBkYXRhIHN0YXRlIHNldCAtIG5lZWRlZCBmb3IgZG9pbmcKKwkJCQkgICog YSBicmVhaworCQkJCSAgKi8KIAlpbnQgZmxhZ3M7CQkvKiBzb21lIEFTWU5DX3h4eHggZmxhZ3Mg YXJlIHN1cHBvcnRlZCAqLwogCXVuc2lnbmVkIGxvbmcgbGFzdF9kdHJfcnRzOwkvKiBzYXZlZCBt b2RlbSBjb250cm9sIG91dHB1dHMgKi8KIAljaGFyIHByZXZfc3RhdHVzOyAgICAgICAgLyogVXNl ZCBmb3IgVElPQ01JV0FJVCAqLwpAQCAtMTE5NSw3ICsxMTk0LDcgQEAgc3RhdGljIGludCB1cGRh dGVfbWN0cmwoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCwgdW5zaWduZWQgaW50IHNldCwK IHsKIAlzdHJ1Y3QgZnRkaV9wcml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRh KHBvcnQpOwogCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZwb3J0LT5kZXY7Ci0JdW5zaWduZWQgdXJi X3ZhbHVlOworCXVuc2lnbmVkIHZhbHVlOwogCWludCBydjsKIAogCWlmICgoKHNldCB8IGNsZWFy KSAmIChUSU9DTV9EVFIgfCBUSU9DTV9SVFMpKSA9PSAwKSB7CkBAIC0xMjA0LDIwICsxMjAzLDIw IEBAIHN0YXRpYyBpbnQgdXBkYXRlX21jdHJsKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQs IHVuc2lnbmVkIGludCBzZXQsCiAJfQogCiAJY2xlYXIgJj0gfnNldDsJLyogJ3NldCcgdGFrZXMg cHJlY2VkZW5jZSBvdmVyICdjbGVhcicgKi8KLQl1cmJfdmFsdWUgPSAwOworCXZhbHVlID0gMDsK IAlpZiAoY2xlYXIgJiBUSU9DTV9EVFIpCi0JCXVyYl92YWx1ZSB8PSBGVERJX1NJT19TRVRfRFRS X0xPVzsKKwkJdmFsdWUgfD0gRlRESV9TSU9fU0VUX0RUUl9MT1c7CiAJaWYgKGNsZWFyICYgVElP Q01fUlRTKQotCQl1cmJfdmFsdWUgfD0gRlRESV9TSU9fU0VUX1JUU19MT1c7CisJCXZhbHVlIHw9 IEZURElfU0lPX1NFVF9SVFNfTE9XOwogCWlmIChzZXQgJiBUSU9DTV9EVFIpCi0JCXVyYl92YWx1 ZSB8PSBGVERJX1NJT19TRVRfRFRSX0hJR0g7CisJCXZhbHVlIHw9IEZURElfU0lPX1NFVF9EVFJf SElHSDsKIAlpZiAoc2V0ICYgVElPQ01fUlRTKQotCQl1cmJfdmFsdWUgfD0gRlRESV9TSU9fU0VU X1JUU19ISUdIOworCQl2YWx1ZSB8PSBGVERJX1NJT19TRVRfUlRTX0hJR0g7CiAJcnYgPSB1c2Jf Y29udHJvbF9tc2cocG9ydC0+c2VyaWFsLT5kZXYsCiAJCQkgICAgICAgdXNiX3NuZGN0cmxwaXBl KHBvcnQtPnNlcmlhbC0+ZGV2LCAwKSwKIAkJCSAgICAgICBGVERJX1NJT19TRVRfTU9ERU1fQ1RS TF9SRVFVRVNULAogCQkJICAgICAgIEZURElfU0lPX1NFVF9NT0RFTV9DVFJMX1JFUVVFU1RfVFlQ RSwKLQkJCSAgICAgICB1cmJfdmFsdWUsIHByaXYtPmludGVyZmFjZSwKKwkJCSAgICAgICB2YWx1 ZSwgcHJpdi0+aW50ZXJmYWNlLAogCQkJICAgICAgIE5VTEwsIDAsIFdEUl9USU1FT1VUKTsKIAlp ZiAocnYgPCAwKSB7CiAJCWRldl9kYmcoZGV2LCAiJXMgRXJyb3IgZnJvbSBNT0RFTV9DVFJMIHVy YjogRFRSICVzLCBSVFMgJXNcbiIsCkBAIC0xMzQ2LDI2ICsxMzQ1LDI2IEBAIHN0YXRpYyB1MzIg Z2V0X2Z0ZGlfZGl2aXNvcihzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAogc3RhdGljIGludCBjaGFu Z2Vfc3BlZWQoc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwgc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAq cG9ydCkKIHsKIAlzdHJ1Y3QgZnRkaV9wcml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9y dF9kYXRhKHBvcnQpOwotCXUxNiB1cmJfdmFsdWU7Ci0JdTE2IHVyYl9pbmRleDsKLQl1MzIgdXJi X2luZGV4X3ZhbHVlOworCXUxNiB2YWx1ZTsKKwl1MTYgaW5kZXg7CisJdTMyIGluZGV4X3ZhbHVl OwogCWludCBydjsKIAotCXVyYl9pbmRleF92YWx1ZSA9IGdldF9mdGRpX2Rpdmlzb3IodHR5LCBw b3J0KTsKLQl1cmJfdmFsdWUgPSAodTE2KXVyYl9pbmRleF92YWx1ZTsKLQl1cmJfaW5kZXggPSAo dTE2KSh1cmJfaW5kZXhfdmFsdWUgPj4gMTYpOworCWluZGV4X3ZhbHVlID0gZ2V0X2Z0ZGlfZGl2 aXNvcih0dHksIHBvcnQpOworCXZhbHVlID0gKHUxNilpbmRleF92YWx1ZTsKKwlpbmRleCA9ICh1 MTYpKGluZGV4X3ZhbHVlID4+IDE2KTsKIAlpZiAoKHByaXYtPmNoaXBfdHlwZSA9PSBGVDIyMzJD KSB8fCAocHJpdi0+Y2hpcF90eXBlID09IEZUMjIzMkgpIHx8CiAJCShwcml2LT5jaGlwX3R5cGUg PT0gRlQ0MjMySCkgfHwgKHByaXYtPmNoaXBfdHlwZSA9PSBGVDIzMkgpKSB7CiAJCS8qIFByb2Jh Ymx5IHRoZSBCTSB0eXBlIG5lZWRzIHRoZSBNU0Igb2YgdGhlIGVuY29kZWQgZnJhY3Rpb25hbAog CQkgKiBkaXZpZGVyIGFsc28gbW92ZWQgbGlrZSBmb3IgdGhlIGNoaXBzIGFib3ZlLiBBbnkgaW5m b3M/ICovCi0JCXVyYl9pbmRleCA9ICh1MTYpKCh1cmJfaW5kZXggPDwgOCkgfCBwcml2LT5pbnRl cmZhY2UpOworCQlpbmRleCA9ICh1MTYpKChpbmRleCA8PCA4KSB8IHByaXYtPmludGVyZmFjZSk7 CiAJfQogCiAJcnYgPSB1c2JfY29udHJvbF9tc2cocG9ydC0+c2VyaWFsLT5kZXYsCiAJCQkgICAg dXNiX3NuZGN0cmxwaXBlKHBvcnQtPnNlcmlhbC0+ZGV2LCAwKSwKIAkJCSAgICBGVERJX1NJT19T RVRfQkFVRFJBVEVfUkVRVUVTVCwKIAkJCSAgICBGVERJX1NJT19TRVRfQkFVRFJBVEVfUkVRVUVT VF9UWVBFLAotCQkJICAgIHVyYl92YWx1ZSwgdXJiX2luZGV4LAorCQkJICAgIHZhbHVlLCBpbmRl eCwKIAkJCSAgICBOVUxMLCAwLCBXRFJfU0hPUlRfVElNRU9VVCk7CiAJcmV0dXJuIHJ2OwogfQpA QCAtMjE0MCwyOSArMjEzOSwyOSBAQCBzdGF0aWMgdm9pZCBmdGRpX2JyZWFrX2N0bChzdHJ1Y3Qg dHR5X3N0cnVjdCAqdHR5LCBpbnQgYnJlYWtfc3RhdGUpCiB7CiAJc3RydWN0IHVzYl9zZXJpYWxf cG9ydCAqcG9ydCA9IHR0eS0+ZHJpdmVyX2RhdGE7CiAJc3RydWN0IGZ0ZGlfcHJpdmF0ZSAqcHJp diA9IHVzYl9nZXRfc2VyaWFsX3BvcnRfZGF0YShwb3J0KTsKLQl1MTYgdXJiX3ZhbHVlOworCXUx NiB2YWx1ZTsKIAogCS8qIGJyZWFrX3N0YXRlID0gLTEgdG8gdHVybiBvbiBicmVhaywgYW5kIDAg dG8gdHVybiBvZmYgYnJlYWsgKi8KIAkvKiBzZWUgZHJpdmVycy9jaGFyL3R0eV9pby5jIHRvIHNl ZSBpdCB1c2VkICovCi0JLyogbGFzdF9zZXRfZGF0YV91cmJfdmFsdWUgTkVWRVIgaGFzIHRoZSBi cmVhayBiaXQgc2V0IGluIGl0ICovCisJLyogbGFzdF9zZXRfZGF0YV92YWx1ZSBORVZFUiBoYXMg dGhlIGJyZWFrIGJpdCBzZXQgaW4gaXQgKi8KIAogCWlmIChicmVha19zdGF0ZSkKLQkJdXJiX3Zh bHVlID0gcHJpdi0+bGFzdF9zZXRfZGF0YV91cmJfdmFsdWUgfCBGVERJX1NJT19TRVRfQlJFQUs7 CisJCXZhbHVlID0gcHJpdi0+bGFzdF9zZXRfZGF0YV92YWx1ZSB8IEZURElfU0lPX1NFVF9CUkVB SzsKIAllbHNlCi0JCXVyYl92YWx1ZSA9IHByaXYtPmxhc3Rfc2V0X2RhdGFfdXJiX3ZhbHVlOwor CQl2YWx1ZSA9IHByaXYtPmxhc3Rfc2V0X2RhdGFfdmFsdWU7CiAKIAlpZiAodXNiX2NvbnRyb2xf bXNnKHBvcnQtPnNlcmlhbC0+ZGV2LAogCQkJdXNiX3NuZGN0cmxwaXBlKHBvcnQtPnNlcmlhbC0+ ZGV2LCAwKSwKIAkJCUZURElfU0lPX1NFVF9EQVRBX1JFUVVFU1QsCiAJCQlGVERJX1NJT19TRVRf REFUQV9SRVFVRVNUX1RZUEUsCi0JCQl1cmJfdmFsdWUgLCBwcml2LT5pbnRlcmZhY2UsCisJCQl2 YWx1ZSAsIHByaXYtPmludGVyZmFjZSwKIAkJCU5VTEwsIDAsIFdEUl9USU1FT1VUKSA8IDApIHsK IAkJZGV2X2VycigmcG9ydC0+ZGV2LCAiJXMgRkFJTEVEIHRvIGVuYWJsZS9kaXNhYmxlIGJyZWFr IHN0YXRlIChzdGF0ZSB3YXMgJWQpXG4iLAogCQkJX19mdW5jX18sIGJyZWFrX3N0YXRlKTsKIAl9 CiAKIAlkZXZfZGJnKCZwb3J0LT5kZXYsICIlcyBicmVhayBzdGF0ZSBpcyAlZCAtIHVyYiBpcyAl ZFxuIiwgX19mdW5jX18sCi0JCWJyZWFrX3N0YXRlLCB1cmJfdmFsdWUpOworCQlicmVha19zdGF0 ZSwgdmFsdWUpOwogCiB9CiAKQEAgLTIxOTIsNyArMjE5MSw3IEBAIHN0YXRpYyB2b2lkIGZ0ZGlf c2V0X3Rlcm1pb3Moc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKIAlzdHJ1Y3QgZnRkaV9wcml2YXRl ICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQpOwogCXN0cnVjdCBrdGVybWlv cyAqdGVybWlvcyA9ICZ0dHktPnRlcm1pb3M7CiAJdW5zaWduZWQgaW50IGNmbGFnID0gdGVybWlv cy0+Y19jZmxhZzsKLQl1MTYgdXJiX3ZhbHVlOyAvKiB3aWxsIGhvbGQgdGhlIG5ldyBmbGFncyAq LworCXUxNiB2YWx1ZTsKIAogCS8qIEFkZGVkIGZvciB4b24veG9mZiBzdXBwb3J0ICovCiAJdW5z aWduZWQgaW50IGlmbGFnID0gdGVybWlvcy0+Y19pZmxhZzsKQEAgLTIyNTgsNDQgKzIyNTcsNDQg QEAgc3RhdGljIHZvaWQgZnRkaV9zZXRfdGVybWlvcyhzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAog bm9fc2tpcDoKIAkvKiBTZXQgbnVtYmVyIG9mIGRhdGEgYml0cywgcGFyaXR5LCBzdG9wIGJpdHMg Ki8KIAotCXVyYl92YWx1ZSA9IDA7Ci0JdXJiX3ZhbHVlIHw9IChjZmxhZyAmIENTVE9QQiA/IEZU RElfU0lPX1NFVF9EQVRBX1NUT1BfQklUU18yIDoKLQkJICAgICAgRlRESV9TSU9fU0VUX0RBVEFf U1RPUF9CSVRTXzEpOworCXZhbHVlID0gMDsKKwl2YWx1ZSB8PSAoY2ZsYWcgJiBDU1RPUEIgPyBG VERJX1NJT19TRVRfREFUQV9TVE9QX0JJVFNfMiA6CisJCQlGVERJX1NJT19TRVRfREFUQV9TVE9Q X0JJVFNfMSk7CiAJaWYgKGNmbGFnICYgUEFSRU5CKSB7CiAJCWlmIChjZmxhZyAmIENNU1BBUikK LQkJCXVyYl92YWx1ZSB8PSBjZmxhZyAmIFBBUk9ERCA/Ci0JCQkJICAgICBGVERJX1NJT19TRVRf REFUQV9QQVJJVFlfTUFSSyA6Ci0JCQkJICAgICBGVERJX1NJT19TRVRfREFUQV9QQVJJVFlfU1BB Q0U7CisJCQl2YWx1ZSB8PSBjZmxhZyAmIFBBUk9ERCA/CisJCQkJCUZURElfU0lPX1NFVF9EQVRB X1BBUklUWV9NQVJLIDoKKwkJCQkJRlRESV9TSU9fU0VUX0RBVEFfUEFSSVRZX1NQQUNFOwogCQll bHNlCi0JCQl1cmJfdmFsdWUgfD0gY2ZsYWcgJiBQQVJPREQgPwotCQkJCSAgICAgRlRESV9TSU9f U0VUX0RBVEFfUEFSSVRZX09ERCA6Ci0JCQkJICAgICBGVERJX1NJT19TRVRfREFUQV9QQVJJVFlf RVZFTjsKKwkJCXZhbHVlIHw9IGNmbGFnICYgUEFST0REID8KKwkJCQkJRlRESV9TSU9fU0VUX0RB VEFfUEFSSVRZX09ERCA6CisJCQkJCUZURElfU0lPX1NFVF9EQVRBX1BBUklUWV9FVkVOOwogCX0g ZWxzZSB7Ci0JCXVyYl92YWx1ZSB8PSBGVERJX1NJT19TRVRfREFUQV9QQVJJVFlfTk9ORTsKKwkJ dmFsdWUgfD0gRlRESV9TSU9fU0VUX0RBVEFfUEFSSVRZX05PTkU7CiAJfQogCXN3aXRjaCAoY2Zs YWcgJiBDU0laRSkgewogCWNhc2UgQ1M1OgogCQlkZXZfZGJnKGRkZXYsICJTZXR0aW5nIENTNSBx dWlya1xuIik7CiAJCWJyZWFrOwogCWNhc2UgQ1M3OgotCQl1cmJfdmFsdWUgfD0gNzsKKwkJdmFs dWUgfD0gNzsKIAkJZGV2X2RiZyhkZGV2LCAiU2V0dGluZyBDUzdcbiIpOwogCQlicmVhazsKIAlk ZWZhdWx0OgogCWNhc2UgQ1M4OgotCQl1cmJfdmFsdWUgfD0gODsKKwkJdmFsdWUgfD0gODsKIAkJ ZGV2X2RiZyhkZGV2LCAiU2V0dGluZyBDUzhcbiIpOwogCQlicmVhazsKIAl9CiAKIAkvKiBUaGlz IGlzIG5lZWRlZCBieSB0aGUgYnJlYWsgY29tbWFuZCBzaW5jZSBpdCB1c2VzIHRoZSBzYW1lIGNv bW1hbmQKIAkgICAtIGJ1dCBpcyBvcidlZCB3aXRoIHRoaXMgdmFsdWUgICovCi0JcHJpdi0+bGFz dF9zZXRfZGF0YV91cmJfdmFsdWUgPSB1cmJfdmFsdWU7CisJcHJpdi0+bGFzdF9zZXRfZGF0YV92 YWx1ZSA9IHZhbHVlOwogCiAJaWYgKHVzYl9jb250cm9sX21zZyhkZXYsIHVzYl9zbmRjdHJscGlw ZShkZXYsIDApLAogCQkJICAgIEZURElfU0lPX1NFVF9EQVRBX1JFUVVFU1QsCiAJCQkgICAgRlRE SV9TSU9fU0VUX0RBVEFfUkVRVUVTVF9UWVBFLAotCQkJICAgIHVyYl92YWx1ZSAsIHByaXYtPmlu dGVyZmFjZSwKKwkJCSAgICB2YWx1ZSAsIHByaXYtPmludGVyZmFjZSwKIAkJCSAgICBOVUxMLCAw LCBXRFJfU0hPUlRfVElNRU9VVCkgPCAwKSB7CiAJCWRldl9lcnIoZGRldiwgIiVzIEZBSUxFRCB0 byBzZXQgZGF0YWJpdHMvc3RvcGJpdHMvcGFyaXR5XG4iLAogCQkJX19mdW5jX18pOwpAQCAtMjM1 NCwxMyArMjM1MywxMyBAQCBzdGF0aWMgdm9pZCBmdGRpX3NldF90ZXJtaW9zKHN0cnVjdCB0dHlf c3RydWN0ICp0dHksCiAJCQkgKi8KIAkJCXZzdGFydCA9IHRlcm1pb3MtPmNfY2NbVlNUQVJUXTsK IAkJCXZzdG9wID0gdGVybWlvcy0+Y19jY1tWU1RPUF07Ci0JCQl1cmJfdmFsdWUgPSAodnN0b3Ag PDwgOCkgfCAodnN0YXJ0KTsKKwkJCXZhbHVlID0gKHZzdG9wIDw8IDgpIHwgKHZzdGFydCk7CiAK IAkJCWlmICh1c2JfY29udHJvbF9tc2coZGV2LAogCQkJCQkgICAgdXNiX3NuZGN0cmxwaXBlKGRl diwgMCksCiAJCQkJCSAgICBGVERJX1NJT19TRVRfRkxPV19DVFJMX1JFUVVFU1QsCiAJCQkJCSAg ICBGVERJX1NJT19TRVRfRkxPV19DVFJMX1JFUVVFU1RfVFlQRSwKLQkJCQkJICAgIHVyYl92YWx1 ZSAsIChGVERJX1NJT19YT05fWE9GRl9IUworCQkJCQkgICAgdmFsdWUgLCAoRlRESV9TSU9fWE9O X1hPRkZfSFMKIAkJCQkJCQkgfCBwcml2LT5pbnRlcmZhY2UpLAogCQkJCQkgICAgTlVMTCwgMCwg V0RSX1RJTUVPVVQpIDwgMCkgewogCQkJCWRldl9lcnIoJnBvcnQtPmRldiwgInVyYiBmYWlsZWQg dG8gc2V0IHRvICIK