Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [18/19] usbnet: smsc95xx: Remove all of the carrier checking code From: Marek Vasut Message-Id: <20190103011040.25974-19-marex@denx.de> Date: Thu, 3 Jan 2019 02:10:39 +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: VGhlIGNhcnJpZXIgY2hlY2tpbmcgY29kZSBpcyBjb21wbGV0ZWx5IGhhbmRsZWQgYnkgdGhlIGlu dGVybmFsIHBoeWRldgpzdGF0ZSBtYWNoaW5lLCByZW1vdmUgaXQuCgpTaWduZWQtb2ZmLWJ5OiBN YXJlayBWYXN1dCA8bWFyZXhAZGVueC5kZT4KQ2M6IERhdmlkIFMuIE1pbGxlciA8ZGF2ZW1AZGF2 ZW1sb2Z0Lm5ldD4KQ2M6IE5pc2FyIFNheWVkIDxOaXNhci5TYXllZEBtaWNyb2NoaXAuY29tPgpD YzogV29vanVuZyBIdWggPFdvb2p1bmcuSHVoQG1pY3JvY2hpcC5jb20+CkNjOiBBbmRyZXcgTHVu biA8YW5kcmV3QGx1bm4uY2g+CkNjOiBGbG9yaWFuIEZhaW5lbGxpIDxmLmZhaW5lbGxpQGdtYWls LmNvbT4KQ2M6IGxpbnV4LXVzYkB2Z2VyLmtlcm5lbC5vcmcKVG86IG5ldGRldkB2Z2VyLmtlcm5l bC5vcmcKLS0tCiBkcml2ZXJzL25ldC91c2Ivc21zYzk1eHguYyB8IDUzICsrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCsp LCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC91c2Ivc21zYzk1eHgu YyBiL2RyaXZlcnMvbmV0L3VzYi9zbXNjOTV4eC5jCmluZGV4IGVhNWI5ZGUxMDM0OC4uYzk5MzE5 NTVjMjJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC91c2Ivc21zYzk1eHguYworKysgYi9kcml2 ZXJzL25ldC91c2Ivc21zYzk1eHguYwpAQCAtNzUsNyArNzUsNiBAQCBzdHJ1Y3Qgc21zYzk1eHhf cHJpdiB7CiAJdTggc3VzcGVuZF9mbGFnczsKIAl1OCBtZGl4X2N0cmw7CiAJYm9vbCBsaW5rX29r OwotCXN0cnVjdCBkZWxheWVkX3dvcmsgY2Fycmllcl9jaGVjazsKIAlzdHJ1Y3QgdXNibmV0ICpk ZXY7CiAJc3RydWN0IG1paV9idXMgKm1paV9idXM7CiAJc3RydWN0IHBoeV9kZXZpY2UgKnBoeWRl djsKQEAgLTYwNSw0NCArNjA0LDYgQEAgc3RhdGljIHZvaWQgc21zYzk1eHhfc3RhdHVzKHN0cnVj dCB1c2JuZXQgKmRldiwgc3RydWN0IHVyYiAqdXJiKQogCQkJICAgIGludGRhdGEpOwogfQogCi1z dGF0aWMgdm9pZCBzZXRfY2FycmllcihzdHJ1Y3QgdXNibmV0ICpkZXYsIGJvb2wgbGluaykKLXsK LQlzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAqcGRhdGEgPSAoc3RydWN0IHNtc2M5NXh4X3ByaXYgKiko ZGV2LT5kYXRhWzBdKTsKLQotCWlmIChwZGF0YS0+bGlua19vayA9PSBsaW5rKQotCQlyZXR1cm47 Ci0KLQlwZGF0YS0+bGlua19vayA9IGxpbms7Ci0KLQlpZiAobGluaykKLQkJdXNibmV0X2xpbmtf Y2hhbmdlKGRldiwgMSwgMCk7Ci0JZWxzZQotCQl1c2JuZXRfbGlua19jaGFuZ2UoZGV2LCAwLCAw KTsKLX0KLQotc3RhdGljIHZvaWQgY2hlY2tfY2FycmllcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndv cmspCi17Ci0Jc3RydWN0IHNtc2M5NXh4X3ByaXYgKnBkYXRhID0gY29udGFpbmVyX29mKHdvcmss IHN0cnVjdCBzbXNjOTV4eF9wcml2LAotCQkJCQkJY2Fycmllcl9jaGVjay53b3JrKTsKLQlzdHJ1 Y3QgdXNibmV0ICpkZXYgPSBwZGF0YS0+ZGV2OwotCWludCByZXQ7Ci0KLQlpZiAocGRhdGEtPnN1 c3BlbmRfZmxhZ3MgIT0gMCkKLQkJcmV0dXJuOwotCi0JcmV0ID0gcGh5X3JlYWQocGRhdGEtPnBo eWRldiwgTUlJX0JNU1IpOwotCWlmIChyZXQgPCAwKSB7Ci0JCW5ldGRldl93YXJuKGRldi0+bmV0 LCAiRmFpbGVkIHRvIHJlYWQgTUlJX0JNU1JcbiIpOwotCQlyZXR1cm47Ci0JfQotCWlmIChyZXQg JiBCTVNSX0xTVEFUVVMpCi0JCXNldF9jYXJyaWVyKGRldiwgMSk7Ci0JZWxzZQotCQlzZXRfY2Fy cmllcihkZXYsIDApOwotCi0Jc2NoZWR1bGVfZGVsYXllZF93b3JrKCZwZGF0YS0+Y2Fycmllcl9j aGVjaywgQ0FSUklFUl9DSEVDS19ERUxBWSk7Ci19Ci0KIC8qIEVuYWJsZSBvciBkaXNhYmxlIFR4 ICYgUnggY2hlY2tzdW0gb2ZmbG9hZCBlbmdpbmVzICovCiBzdGF0aWMgaW50IHNtc2M5NXh4X3Nl dF9mZWF0dXJlcyhzdHJ1Y3QgbmV0X2RldmljZSAqbmV0ZGV2LAogCW5ldGRldl9mZWF0dXJlc190 IGZlYXR1cmVzKQpAQCAtMTM3MCw5ICsxMzMxLDYgQEAgc3RhdGljIGludCBzbXNjOTV4eF9iaW5k KHN0cnVjdCB1c2JuZXQgKmRldiwgc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGYpCiAJZGV2LT5u ZXQtPm1heF9tdHUgPSBFVEhfREFUQV9MRU47CiAJZGV2LT5oYXJkX210dSA9IGRldi0+bmV0LT5t dHUgKyBkZXYtPm5ldC0+aGFyZF9oZWFkZXJfbGVuOwogCi0JSU5JVF9ERUxBWUVEX1dPUksoJnBk YXRhLT5jYXJyaWVyX2NoZWNrLCBjaGVja19jYXJyaWVyKTsKLQlzY2hlZHVsZV9kZWxheWVkX3dv cmsoJnBkYXRhLT5jYXJyaWVyX2NoZWNrLCBDQVJSSUVSX0NIRUNLX0RFTEFZKTsKLQogCXJldHVy biAwOwogZXJyX21kaW9idXNfcmVnaXN0ZXI6CiAJbWRpb2J1c19mcmVlKGJ1cyk7CkBAIC0xMzg2 LDcgKzEzNDQsNiBAQCBzdGF0aWMgdm9pZCBzbXNjOTV4eF91bmJpbmQoc3RydWN0IHVzYm5ldCAq ZGV2LCBzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZikKIAlzdHJ1Y3Qgc21zYzk1eHhfcHJpdiAq cGRhdGEgPSAoc3RydWN0IHNtc2M5NXh4X3ByaXYgKikoZGV2LT5kYXRhWzBdKTsKIAogCWlmIChw ZGF0YSkgewotCQljYW5jZWxfZGVsYXllZF93b3JrKCZwZGF0YS0+Y2Fycmllcl9jaGVjayk7CiAJ CW5ldGlmX2RiZyhkZXYsIGlmZG93biwgZGV2LT5uZXQsICJmcmVlIHBkYXRhXG4iKTsKIAkJbWRp b2J1c191bnJlZ2lzdGVyKHBkYXRhLT5taWlfYnVzKTsKIAkJbWRpb2J1c19mcmVlKHBkYXRhLT5t aWlfYnVzKTsKQEAgLTE2MzksMTQgKzE1OTYsMTQgQEAgc3RhdGljIGludCBzbXNjOTV4eF9zdXNw ZW5kKHN0cnVjdCB1c2JfaW50ZXJmYWNlICppbnRmLCBwbV9tZXNzYWdlX3QgbWVzc2FnZSkKIAl1 MzIgdmFsLCBsaW5rX3VwOwogCWludCByZXQ7CiAKKwlwaHlfc3RvcChwZGF0YS0+cGh5ZGV2KTsK KwogCXJldCA9IHVzYm5ldF9zdXNwZW5kKGludGYsIG1lc3NhZ2UpOwogCWlmIChyZXQgPCAwKSB7 CiAJCW5ldGRldl93YXJuKGRldi0+bmV0LCAidXNibmV0X3N1c3BlbmQgZXJyb3JcbiIpOwogCQly ZXR1cm4gcmV0OwogCX0KIAotCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmcGRhdGEtPmNhcnJp ZXJfY2hlY2spOwotCiAJaWYgKHBkYXRhLT5zdXNwZW5kX2ZsYWdzKSB7CiAJCW5ldGRldl93YXJu KGRldi0+bmV0LCAiZXJyb3IgZHVyaW5nIGxhc3QgcmVzdW1lXG4iKTsKIAkJcGRhdGEtPnN1c3Bl bmRfZmxhZ3MgPSAwOwpAQCAtMTg5MSw4ICsxODQ4LDcgQEAgc3RhdGljIGludCBzbXNjOTV4eF9z dXNwZW5kKHN0cnVjdCB1c2JfaW50ZXJmYWNlICppbnRmLCBwbV9tZXNzYWdlX3QgbWVzc2FnZSkK IAkJdXNibmV0X3Jlc3VtZShpbnRmKTsKIAogCWlmIChyZXQpCi0JCXNjaGVkdWxlX2RlbGF5ZWRf d29yaygmcGRhdGEtPmNhcnJpZXJfY2hlY2ssCi0JCQkJICAgICAgQ0FSUklFUl9DSEVDS19ERUxB WSk7CisJCXBoeV9zdGFydChwZGF0YS0+cGh5ZGV2KTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC0x OTEzLDcgKzE4NjksNiBAQCBzdGF0aWMgaW50IHNtc2M5NXh4X3Jlc3VtZShzdHJ1Y3QgdXNiX2lu dGVyZmFjZSAqaW50ZikKIAogCS8qIGRvIHRoaXMgZmlyc3QgdG8gZW5zdXJlIGl0J3MgY2xlYXJl ZCBldmVuIGluIGVycm9yIGNhc2UgKi8KIAlwZGF0YS0+c3VzcGVuZF9mbGFncyA9IDA7Ci0Jc2No ZWR1bGVfZGVsYXllZF93b3JrKCZwZGF0YS0+Y2Fycmllcl9jaGVjaywgQ0FSUklFUl9DSEVDS19E RUxBWSk7CiAKIAlpZiAoc3VzcGVuZF9mbGFncyAmIFNVU1BFTkRfQUxMTU9ERVMpIHsKIAkJLyog Y2xlYXIgd2FrZS11cCBzb3VyY2VzICovCkBAIC0xOTQ0LDYgKzE4OTksOCBAQCBzdGF0aWMgaW50 IHNtc2M5NXh4X3Jlc3VtZShzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZikKIAlpZiAocmV0IDwg MCkKIAkJbmV0ZGV2X3dhcm4oZGV2LT5uZXQsICJ1c2JuZXRfcmVzdW1lIGVycm9yXG4iKTsKIAor CXBoeV9zdGFydChwZGF0YS0+cGh5ZGV2KTsKKwogCXJldHVybiByZXQ7CiB9CiAK