Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() From: Marek Vasut Message-Id: <20190103011040.25974-11-marex@denx.de> Date: Thu, 3 Jan 2019 02:10:31 +0100 To: netdev@vger.kernel.org Cc: Marek Vasut , "David S . Miller" , Nisar Sayed , Woojung Huh , Andrew Lunn , Florian Fainelli , linux-usb@vger.kernel.org List-ID: SnVzdCByZXBsYWNlIHNtc2M5NXh4X21kaW9fcmVhZCgpIHdpdGggZ2VuZXJpYyBwaHlfcmVhZCgp IHRvIHJlZHVjZQp1c2FnZSBvZiB0aGUgYWQtaG9jIGFjY2Vzc29ycy4KClNpZ25lZC1vZmYtYnk6 IE1hcmVrIFZhc3V0IDxtYXJleEBkZW54LmRlPgpDYzogRGF2aWQgUy4gTWlsbGVyIDxkYXZlbUBk YXZlbWxvZnQubmV0PgpDYzogTmlzYXIgU2F5ZWQgPE5pc2FyLlNheWVkQG1pY3JvY2hpcC5jb20+ CkNjOiBXb29qdW5nIEh1aCA8V29vanVuZy5IdWhAbWljcm9jaGlwLmNvbT4KQ2M6IEFuZHJldyBM dW5uIDxhbmRyZXdAbHVubi5jaD4KQ2M6IEZsb3JpYW4gRmFpbmVsbGkgPGYuZmFpbmVsbGlAZ21h aWwuY29tPgpDYzogbGludXgtdXNiQHZnZXIua2VybmVsLm9yZwpUbzogbmV0ZGV2QHZnZXIua2Vy bmVsLm9yZwotLS0KIGRyaXZlcnMvbmV0L3VzYi9zbXNjOTV4eC5jIHwgMzcgKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIwIGluc2VydGlvbnMo KyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3VzYi9zbXNjOTV4 eC5jIGIvZHJpdmVycy9uZXQvdXNiL3Ntc2M5NXh4LmMKaW5kZXggY2U2MWJlOGVlMzJiLi41M2Y4 MTdlNjk5ZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3VzYi9zbXNjOTV4eC5jCisrKyBiL2Ry aXZlcnMvbmV0L3VzYi9zbXNjOTV4eC5jCkBAIC01NDcsNyArNTQ3LDcgQEAgc3RhdGljIGludCBz bXNjOTV4eF9saW5rX3Jlc2V0KHN0cnVjdCB1c2JuZXQgKmRldikKIAlpbnQgcmV0OwogCiAJLyog Y2xlYXIgaW50ZXJydXB0IHN0YXR1cyAqLwotCXJldCA9IHNtc2M5NXh4X21kaW9fcmVhZChkZXYt Pm5ldCwgbWlpLT5waHlfaWQsIFBIWV9JTlRfU1JDKTsKKwlyZXQgPSBwaHlfcmVhZChwZGF0YS0+ cGh5ZGV2LCBQSFlfSU5UX1NSQyk7CiAJaWYgKHJldCA8IDApCiAJCXJldHVybiByZXQ7CiAKQEAg LTU1Nyw4ICs1NTcsOCBAQCBzdGF0aWMgaW50IHNtc2M5NXh4X2xpbmtfcmVzZXQoc3RydWN0IHVz Ym5ldCAqZGV2KQogCiAJbWlpX2NoZWNrX21lZGlhKG1paSwgMSwgMSk7CiAJbWlpX2V0aHRvb2xf Z3NldCgmZGV2LT5taWksICZlY21kKTsKLQlsY2xhZHYgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2 LT5uZXQsIG1paS0+cGh5X2lkLCBNSUlfQURWRVJUSVNFKTsKLQlybXRhZHYgPSBzbXNjOTV4eF9t ZGlvX3JlYWQoZGV2LT5uZXQsIG1paS0+cGh5X2lkLCBNSUlfTFBBKTsKKwlsY2xhZHYgPSBwaHlf cmVhZChwZGF0YS0+cGh5ZGV2LCBNSUlfQURWRVJUSVNFKTsKKwlybXRhZHYgPSBwaHlfcmVhZChw ZGF0YS0+cGh5ZGV2LCBNSUlfTFBBKTsKIAogCW5ldGlmX2RiZyhkZXYsIGxpbmssIGRldi0+bmV0 LAogCQkgICJzcGVlZDogJXUgZHVwbGV4OiAlZCBsY2xhZHY6ICUwNHggcm10YWR2OiAlMDR4XG4i LApAQCAtNjMwLDcgKzYzMCw3IEBAIHN0YXRpYyB2b2lkIGNoZWNrX2NhcnJpZXIoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogCWlmIChwZGF0YS0+c3VzcGVuZF9mbGFncyAhPSAwKQogCQlyZXR1 cm47CiAKLQlyZXQgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQsIGRldi0+bWlpLnBoeV9p ZCwgTUlJX0JNU1IpOworCXJldCA9IHBoeV9yZWFkKHBkYXRhLT5waHlkZXYsIE1JSV9CTVNSKTsK IAlpZiAocmV0IDwgMCkgewogCQluZXRkZXZfd2FybihkZXYtPm5ldCwgIkZhaWxlZCB0byByZWFk IE1JSV9CTVNSXG4iKTsKIAkJcmV0dXJuOwpAQCAtNzY0LDEwICs3NjQsMTEgQEAgc3RhdGljIGlu dCBzbXNjOTV4eF9ldGh0b29sX3NldF93b2woc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwKIHN0YXRp YyBpbnQgZ2V0X21kaXhfc3RhdHVzKHN0cnVjdCBuZXRfZGV2aWNlICpuZXQpCiB7CiAJc3RydWN0 IHVzYm5ldCAqZGV2ID0gbmV0ZGV2X3ByaXYobmV0KTsKKwlzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAq cGRhdGEgPSAoc3RydWN0IHNtc2M5NXh4X3ByaXYgKikoZGV2LT5kYXRhWzBdKTsKIAl1MzIgdmFs OwogCWludCBidWY7CiAKLQlidWYgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQsIGRldi0+ bWlpLnBoeV9pZCwgU1BFQ0lBTF9DVFJMX1NUUyk7CisJYnVmID0gcGh5X3JlYWQocGRhdGEtPnBo eWRldiwgU1BFQ0lBTF9DVFJMX1NUUyk7CiAJaWYgKGJ1ZiAmIFNQRUNJQUxfQ1RSTF9TVFNfT1ZS UkRfQU1ESVhfKSB7CiAJCWlmIChidWYgJiBTUEVDSUFMX0NUUkxfU1RTX0FNRElYX0VOQUJMRV8p CiAJCQlyZXR1cm4gRVRIX1RQX01ESV9BVVRPOwpAQCAtNzkzLDcgKzc5NCw3IEBAIHN0YXRpYyB2 b2lkIHNldF9tZGl4X3N0YXR1cyhzdHJ1Y3QgbmV0X2RldmljZSAqbmV0LCBfX3U4IG1kaXhfY3Ry bCkKIAkgICAgKHBkYXRhLT5jaGlwX2lkID09IElEX1JFVl9DSElQX0lEXzg5NTMwXykgfHwKIAkg ICAgKHBkYXRhLT5jaGlwX2lkID09IElEX1JFVl9DSElQX0lEXzk3MzBfKSkgewogCQkvKiBFeHRl bmQgTWFudWFsIEF1dG9NRElYIHRpbWVyIGZvciA5NTAwQS85NTAwQWkgKi8KLQkJYnVmID0gc21z Yzk1eHhfbWRpb19yZWFkKGRldi0+bmV0LCBkZXYtPm1paS5waHlfaWQsCisJCWJ1ZiA9IHBoeV9y ZWFkKHBkYXRhLT5waHlkZXYsCiAJCQkJCSBQSFlfRURQRF9DT05GSUcpOwogCQlidWYgfD0gUEhZ X0VEUERfQ09ORklHX0VYVF9DUk9TU09WRVJfOwogCQlzbXNjOTV4eF9tZGlvX3dyaXRlKGRldi0+ bmV0LCBkZXYtPm1paS5waHlfaWQsCkBAIC04MDEsNyArODAyLDcgQEAgc3RhdGljIHZvaWQgc2V0 X21kaXhfc3RhdHVzKHN0cnVjdCBuZXRfZGV2aWNlICpuZXQsIF9fdTggbWRpeF9jdHJsKQogCX0K IAogCWlmIChtZGl4X2N0cmwgPT0gRVRIX1RQX01ESSkgewotCQlidWYgPSBzbXNjOTV4eF9tZGlv X3JlYWQoZGV2LT5uZXQsIGRldi0+bWlpLnBoeV9pZCwKKwkJYnVmID0gcGh5X3JlYWQocGRhdGEt PnBoeWRldiwKIAkJCQkJIFNQRUNJQUxfQ1RSTF9TVFMpOwogCQlidWYgfD0gU1BFQ0lBTF9DVFJM X1NUU19PVlJSRF9BTURJWF87CiAJCWJ1ZiAmPSB+KFNQRUNJQUxfQ1RSTF9TVFNfQU1ESVhfRU5B QkxFXyB8CkBAIC04MDksNyArODEwLDcgQEAgc3RhdGljIHZvaWQgc2V0X21kaXhfc3RhdHVzKHN0 cnVjdCBuZXRfZGV2aWNlICpuZXQsIF9fdTggbWRpeF9jdHJsKQogCQlzbXNjOTV4eF9tZGlvX3dy aXRlKGRldi0+bmV0LCBkZXYtPm1paS5waHlfaWQsCiAJCQkJICAgIFNQRUNJQUxfQ1RSTF9TVFMs IGJ1Zik7CiAJfSBlbHNlIGlmIChtZGl4X2N0cmwgPT0gRVRIX1RQX01ESV9YKSB7Ci0JCWJ1ZiA9 IHNtc2M5NXh4X21kaW9fcmVhZChkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLAorCQlidWYgPSBw aHlfcmVhZChwZGF0YS0+cGh5ZGV2LAogCQkJCQkgU1BFQ0lBTF9DVFJMX1NUUyk7CiAJCWJ1ZiB8 PSBTUEVDSUFMX0NUUkxfU1RTX09WUlJEX0FNRElYXzsKIAkJYnVmICY9IH4oU1BFQ0lBTF9DVFJM X1NUU19BTURJWF9FTkFCTEVfIHwKQEAgLTgxOCw3ICs4MTksNyBAQCBzdGF0aWMgdm9pZCBzZXRf bWRpeF9zdGF0dXMoc3RydWN0IG5ldF9kZXZpY2UgKm5ldCwgX191OCBtZGl4X2N0cmwpCiAJCXNt c2M5NXh4X21kaW9fd3JpdGUoZGV2LT5uZXQsIGRldi0+bWlpLnBoeV9pZCwKIAkJCQkgICAgU1BF Q0lBTF9DVFJMX1NUUywgYnVmKTsKIAl9IGVsc2UgaWYgKG1kaXhfY3RybCA9PSBFVEhfVFBfTURJ X0FVVE8pIHsKLQkJYnVmID0gc21zYzk1eHhfbWRpb19yZWFkKGRldi0+bmV0LCBkZXYtPm1paS5w aHlfaWQsCisJCWJ1ZiA9IHBoeV9yZWFkKHBkYXRhLT5waHlkZXYsCiAJCQkJCSBTUEVDSUFMX0NU UkxfU1RTKTsKIAkJYnVmICY9IH5TUEVDSUFMX0NUUkxfU1RTX09WUlJEX0FNRElYXzsKIAkJYnVm ICY9IH4oU1BFQ0lBTF9DVFJMX1NUU19BTURJWF9FTkFCTEVfIHwKQEAgLTk2OCw2ICs5NjksNyBA QCBzdGF0aWMgdm9pZCBzbXNjOTV4eF9hZGp1c3RfbGluayhzdHJ1Y3QgbmV0X2RldmljZSAqbmV0 ZGV2KQogCiBzdGF0aWMgaW50IHNtc2M5NXh4X3BoeV9pbml0aWFsaXplKHN0cnVjdCB1c2JuZXQg KmRldikKIHsKKwlzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqcGRhdGEgPSAoc3RydWN0IHNtc2M5NXh4 X3ByaXYgKikoZGV2LT5kYXRhWzBdKTsKIAlpbnQgYm1jciwgcmV0LCB0aW1lb3V0ID0gMDsKIAog CS8qIHJlc2V0IHBoeSBhbmQgd2FpdCBmb3IgcmVzZXQgdG8gY29tcGxldGUgKi8KQEAgLTk3NSw3 ICs5NzcsNyBAQCBzdGF0aWMgaW50IHNtc2M5NXh4X3BoeV9pbml0aWFsaXplKHN0cnVjdCB1c2Ju ZXQgKmRldikKIAogCWRvIHsKIAkJbXNsZWVwKDEwKTsKLQkJYm1jciA9IHNtc2M5NXh4X21kaW9f cmVhZChkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLCBNSUlfQk1DUik7CisJCWJtY3IgPSBwaHlf cmVhZChwZGF0YS0+cGh5ZGV2LCBNSUlfQk1DUik7CiAJCXRpbWVvdXQrKzsKIAl9IHdoaWxlICgo Ym1jciAmIEJNQ1JfUkVTRVQpICYmICh0aW1lb3V0IDwgMTAwKSk7CiAKQEAgLTk4OSw3ICs5OTEs NyBAQCBzdGF0aWMgaW50IHNtc2M5NXh4X3BoeV9pbml0aWFsaXplKHN0cnVjdCB1c2JuZXQgKmRl dikKIAkJQURWRVJUSVNFX1BBVVNFX0FTWU0pOwogCiAJLyogcmVhZCB0byBjbGVhciAqLwotCXJl dCA9IHNtc2M5NXh4X21kaW9fcmVhZChkZXYtPm5ldCwgZGV2LT5taWkucGh5X2lkLCBQSFlfSU5U X1NSQyk7CisJcmV0ID0gcGh5X3JlYWQocGRhdGEtPnBoeWRldiwgUEhZX0lOVF9TUkMpOwogCWlm IChyZXQgPCAwKSB7CiAJCW5ldGRldl93YXJuKGRldi0+bmV0LCAiRmFpbGVkIHRvIHJlYWQgUEhZ X0lOVF9TUkMgZHVyaW5nIGluaXRcbiIpOwogCQlyZXR1cm4gcmV0OwpAQCAtMTQwNywxOCArMTQw OSwxOSBAQCBzdGF0aWMgdTMyIHNtc2NfY3JjKGNvbnN0IHU4ICpidWZmZXIsIHNpemVfdCBsZW4s IGludCBmaWx0ZXIpCiAKIHN0YXRpYyBpbnQgc21zYzk1eHhfZW5hYmxlX3BoeV93YWtldXBfaW50 ZXJydXB0cyhzdHJ1Y3QgdXNibmV0ICpkZXYsIHUxNiBtYXNrKQogeworCXN0cnVjdCBzbXNjOTV4 eF9wcml2ICpwZGF0YSA9IChzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqKShkZXYtPmRhdGFbMF0pOwog CXN0cnVjdCBtaWlfaWZfaW5mbyAqbWlpID0gJmRldi0+bWlpOwogCWludCByZXQ7CiAKIAluZXRk ZXZfZGJnKGRldi0+bmV0LCAiZW5hYmxpbmcgUEhZIHdha2V1cCBpbnRlcnJ1cHRzXG4iKTsKIAog CS8qIHJlYWQgdG8gY2xlYXIgKi8KLQlyZXQgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQs IG1paS0+cGh5X2lkLCBQSFlfSU5UX1NSQyk7CisJcmV0ID0gcGh5X3JlYWQocGRhdGEtPnBoeWRl diwgUEhZX0lOVF9TUkMpOwogCWlmIChyZXQgPCAwKQogCQlyZXR1cm4gcmV0OwogCiAJLyogZW5h YmxlIGludGVycnVwdCBzb3VyY2UgKi8KLQlyZXQgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5u ZXQsIG1paS0+cGh5X2lkLCBQSFlfSU5UX01BU0spOworCXJldCA9IHBoeV9yZWFkKHBkYXRhLT5w aHlkZXYsIFBIWV9JTlRfTUFTSyk7CiAJaWYgKHJldCA8IDApCiAJCXJldHVybiByZXQ7CiAKQEAg LTE0MzEsMTUgKzE0MzQsMTUgQEAgc3RhdGljIGludCBzbXNjOTV4eF9lbmFibGVfcGh5X3dha2V1 cF9pbnRlcnJ1cHRzKHN0cnVjdCB1c2JuZXQgKmRldiwgdTE2IG1hc2spCiAKIHN0YXRpYyBpbnQg c21zYzk1eHhfbGlua19va19ub3BtKHN0cnVjdCB1c2JuZXQgKmRldikKIHsKLQlzdHJ1Y3QgbWlp X2lmX2luZm8gKm1paSA9ICZkZXYtPm1paTsKKwlzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqcGRhdGEg PSAoc3RydWN0IHNtc2M5NXh4X3ByaXYgKikoZGV2LT5kYXRhWzBdKTsKIAlpbnQgcmV0OwogCiAJ LyogZmlyc3QsIGEgZHVtbXkgcmVhZCwgbmVlZGVkIHRvIGxhdGNoIHNvbWUgTUlJIHBoeXMgKi8K LQlyZXQgPSBzbXNjOTV4eF9tZGlvX3JlYWQoZGV2LT5uZXQsIG1paS0+cGh5X2lkLCBNSUlfQk1T Uik7CisJcmV0ID0gcGh5X3JlYWQocGRhdGEtPnBoeWRldiwgTUlJX0JNU1IpOwogCWlmIChyZXQg PCAwKQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gc21zYzk1eHhfbWRpb19yZWFkKGRldi0+bmV0 LCBtaWktPnBoeV9pZCwgTUlJX0JNU1IpOworCXJldCA9IHBoeV9yZWFkKHBkYXRhLT5waHlkZXYs IE1JSV9CTVNSKTsKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTUwMCw3ICsx NTAzLDcgQEAgc3RhdGljIGludCBzbXNjOTV4eF9lbnRlcl9zdXNwZW5kMShzdHJ1Y3QgdXNibmV0 ICpkZXYpCiAJCQkJICAgIFBIWV9FRFBEX0NPTkZJR19ERUZBVUxUKTsKIAogCS8qIGVuYWJsZSBl bmVyZ3kgZGV0ZWN0IHBvd2VyLWRvd24gbW9kZSAqLwotCXJldCA9IHNtc2M5NXh4X21kaW9fcmVh ZChkZXYtPm5ldCwgbWlpLT5waHlfaWQsIFBIWV9NT0RFX0NUUkxfU1RTKTsKKwlyZXQgPSBwaHlf cmVhZChwZGF0YS0+cGh5ZGV2LCBQSFlfTU9ERV9DVFJMX1NUUyk7CiAJaWYgKHJldCA8IDApCiAJ CXJldHVybiByZXQ7CiAK