Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,2/8] usb: typec: fusb302: Refactor / simplify tcpm_set_cc() From: Guenter Roeck Message-Id: <20190307181259.GC26282@roeck-us.net> Date: Thu, 7 Mar 2019 10:12:59 -0800 To: Hans de Goede Cc: Greg Kroah-Hartman , Heikki Krogerus , linux-usb@vger.kernel.org List-ID: T24gVGh1LCBNYXIgMDcsIDIwMTkgYXQgMDU6MzY6MDFQTSArMDEwMCwgSGFucyBkZSBHb2VkZSB3 cm90ZToKPiBBZnRlciBjb21taXQgZWEzYjRkNTUyM2JjICgidXNiOiB0eXBlYzogZnVzYjMwMjog UmVzb2x2ZSBmaXhlZCBwb3dlciByb2xlCj4gY29udHJhY3Qgc2V0dXAiKSwgdGNwbV9zZXRfY2Mg YWx3YXlzIGNhbGxzIGZ1c2IzMDJfc2V0X3RvZ2dsaW5nLgo+IAo+IEJlZm9yZSB0aGlzIHJlZmFj dG9yIHRjcG1fc2V0X2NjIGRvZXMgdGhlIGZvbGxvd2luZzoKPiAKPiAxKSBmdXNiMzAyX3NldF90 b2dnbGluZyhUT0dHTElOR19NT0RFX09GRiksCj4gICAgdGhpcyBzZXRzIGJvdGggRlVTQl9SRUdf TUFTS19CQ19MVkwgYW5kIEZVU0JfUkVHX01BU0tfQ09NUF9DSE5HLgo+IDIpIGZ1c2IzMDJfc2V0 X2NjX3B1bGwoLi4uKS4KPiAzKSAicmVzZXQgY2Mgc3RhdHVzIi4KPiA0KSBpZiBwdWxsLXVwIGZ1 c2IzMDJfc2V0X3NyY19jdXJyZW50KC4uLikuCj4gNSkgaWYgcHVsbC11cCBvciBwdWxsLWRvd24g ZW5hYmxlIGJjLWx2bCByZXNwIGNvbXAtY2huZyBpcnEuCj4gNikgZnVzYjMwMl9zZXRfdG9nZ2xp bmcobmV3LXRvZ2dsaW5nLW1vZGUpLCB3aGljaCBhZ2Fpbgo+ICAgIHNldHMgYm90aCBGVVNCX1JF R19NQVNLX0JDX0xWTCBhbmQgRlVTQl9SRUdfTUFTS19DT01QX0NITkcgZGlzYWJsaW5nCj4gICAg dGhlIGp1c3QgZW5hYmxlZCBpcnEuIGZ1c2IzMDJfc2V0X3RvZ2dsaW5nIGlzIHNraXBwZWQgd2hl biB0aGUgbmV3Cj4gICAgdG9nZ2xpbmcgbW9kZSBpcyBUT0dHTElOR19NT0RFX09GRiBiZWNhdXNl IHRoaXMgaXMgYWxyZWFkeSBkb25lIGluIDEsCj4gICAgbm90ZSBpbiB0aGlzIGNhc2UgNSkgaXMg YSBuby1vcC4KPiAKPiBXaGVuIHdlIGFyZSB0b2dnbGluZyB0aGUgYml0cyBzZXQgYnkgZnVzYjMw Ml9zZXRfY2NfcHVsbCB3aWxsIGJlIGlnbm9yZWQKPiB1bnRpbCB3ZSB0dXJuIHRvZ2dsaW5nIG9m Ziwgc28gd2UgY2FuIHNhZmVseSBtb3ZlIHRoZSBmdXNiMzAyX3NldF9jY19wdWxsCj4gY2FsbCB0 byBiZWZvcmUgc2V0dGluZyBUT0dHTElOR19NT0RFX09GRi4KPiAKPiBFaXRoZXIgd2UgYXJlIG5v dCB0b2dnbGluZyB5ZXQsIG9yIHRoZSBzcmMtY3VycmVudCBoYXMgYWxyZWFkeSBiZWVuIHNldCwK PiBzbyB3ZSBjYW4gYWxzbyBzYWZlbHkgc2V0IHRoZSBzcmMtY3VycmVudCBlYXJsaWVyLCBhbGxv d2luZyB1cyB0byBkbyB0aGUKPiBmdXNiMzAyX3NldF90b2dnbGluZyhUT0dHTElOR19NT0RFX09G RikgY2FsbCBhdCB0aGUgc2FtZSB0aW1lIGFzIHdlCj4gc2V0IHRoZSBvdGhlciB0b2dnbGluZyBt b2Rlcy4gQWxzbyBzZXR0aW5nIHRoZSBzcmMtY3VycmVudCBpcyBhIG5vLW9wCj4gd2hlbiBub3Qg ZW5hYmxpbmcgcHVsbC11cHMsIHNvIHdlIGNhbiBkcm9wIHRoZSBpZi4KPiAKPiBBbmQgc2luY2Ug dGhlIHNlY29uZCBmdXNiMzAyX3NldF90b2dnbGluZyB1bmRvZXMgdGhlIGVmZmVjdHMgb2Ygc3Rl cCA1LAo+IHdlIGNhbiBza2lwIHN0ZXAgNSwgdGhlIGJjLWx2bCByZXNwIGNvbXAtY2huZyBpcnEg d2lsIGJlIGVuYWJsZWQgYnkKPiBmdXNiMzAyX2hhbmRsZV90b2dkb25lX3NuayByZXNwLiBmdXNi MzAyX2hhbmRsZV90b2dkb25lX3NyYyB3aGVuIHRvZ2dsaW5nCj4gaXMgZG9uZS4KPiAKPiBUb2dl dGhlciB0aGlzIGFsbG93cyB1cyB0byBzaW1wbGlmeSB0aGluZ3MgdG86Cj4gCj4gMSkgZnVzYjMw Ml9zZXRfY2NfcHVsbCguLi4pCj4gMikgInJlc2V0IGNjIHN0YXR1cyIKPiAzKSBmdXNiMzAyX3Nl dF9zcmNfY3VycmVudCguLi4pCj4gNCkgZnVzYjMwMl9zZXRfdG9nZ2xpbmcobmV3LXRvZ2dsaW5n LW1vZGUpCj4gCj4gVGhpcyBjb21taXQgZG9lcyB0aGlzLCBsZWFkaW5nIHRvIGEgbmljZSBjbGVh bnVwLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5j b20+CgpJIHRoaW5rIEkgdW5kZXJzdGFuZCB0aGUgbG9naWMsIGJ1dCBJIHRoaW5rIGl0IHdvdWxk IGJlIHJlYWxseSBiZW5lZmljaWFsCmlmIHRoaXMgKGFuZCB0aGUgcmVzdCBvZiB0aGUgc2VyaWVz KSBjYW4gYmUgdGVzdGVkIGluZGVwZW5kZW50bHkgKGllCmJ5IHNvbWVvbmUgd2l0aCBoYXJkd2Fy ZSkuCgpSZXZpZXdlZC1ieTogR3VlbnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0PgoKPiAt LS0KPiAgZHJpdmVycy91c2IvdHlwZWMvdGNwbS9mdXNiMzAyLmMgfCA4NSArKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwg NzAgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0v ZnVzYjMwMi5jIGIvZHJpdmVycy91c2IvdHlwZWMvdGNwbS9mdXNiMzAyLmMKPiBpbmRleCBkMmNj ZTY3Mjg5ZDQuLmJjYjM4ZTM5NzcxMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi90eXBlYy90 Y3BtL2Z1c2IzMDIuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0vZnVzYjMwMi5jCj4g QEAgLTY3Niw3ICs2NzYsNiBAQCBzdGF0aWMgaW50IHRjcG1fc2V0X2NjKHN0cnVjdCB0Y3BjX2Rl diAqZGV2LCBlbnVtIHR5cGVjX2NjX3N0YXR1cyBjYykKPiAgCQkJCQkJIHRjcGNfZGV2KTsKPiAg CWludCByZXQgPSAwOwo+ICAJYm9vbCBwdWxsX3VwLCBwdWxsX2Rvd247Cj4gLQl1OCByZF9tZGE7 Cj4gIAllbnVtIHRvZ2dsaW5nX21vZGUgbW9kZTsKPiAgCj4gIAltdXRleF9sb2NrKCZjaGlwLT5s b2NrKTsKPiBAQCAtNjg0LDE2ICs2ODMsMTkgQEAgc3RhdGljIGludCB0Y3BtX3NldF9jYyhzdHJ1 Y3QgdGNwY19kZXYgKmRldiwgZW51bSB0eXBlY19jY19zdGF0dXMgY2MpCj4gIAljYXNlIFRZUEVD X0NDX09QRU46Cj4gIAkJcHVsbF91cCA9IGZhbHNlOwo+ICAJCXB1bGxfZG93biA9IGZhbHNlOwo+ ICsJCW1vZGUgPSBUT0dHTElOR19NT0RFX09GRjsKPiAgCQlicmVhazsKPiAgCWNhc2UgVFlQRUNf Q0NfUkQ6Cj4gIAkJcHVsbF91cCA9IGZhbHNlOwo+ICAJCXB1bGxfZG93biA9IHRydWU7Cj4gKwkJ bW9kZSA9IFRPR0dMSU5HX01PREVfU05LOwo+ICAJCWJyZWFrOwo+ICAJY2FzZSBUWVBFQ19DQ19S UF9ERUY6Cj4gIAljYXNlIFRZUEVDX0NDX1JQXzFfNToKPiAgCWNhc2UgVFlQRUNfQ0NfUlBfM18w Ogo+ICAJCXB1bGxfdXAgPSB0cnVlOwo+ICAJCXB1bGxfZG93biA9IGZhbHNlOwo+ICsJCW1vZGUg PSBUT0dHTElOR19NT0RFX1NSQzsKPiAgCQlicmVhazsKPiAgCWRlZmF1bHQ6Cj4gIAkJZnVzYjMw Ml9sb2coY2hpcCwgInVuc3VwcG9ydGVkIGNjIHZhbHVlICVzIiwKPiBAQCAtNzAxLDExICs3MDMs OSBAQCBzdGF0aWMgaW50IHRjcG1fc2V0X2NjKHN0cnVjdCB0Y3BjX2RldiAqZGV2LCBlbnVtIHR5 cGVjX2NjX3N0YXR1cyBjYykKPiAgCQlyZXQgPSAtRUlOVkFMOwo+ICAJCWdvdG8gZG9uZTsKPiAg CX0KPiAtCXJldCA9IGZ1c2IzMDJfc2V0X3RvZ2dsaW5nKGNoaXAsIFRPR0dMSU5HX01PREVfT0ZG KTsKPiAtCWlmIChyZXQgPCAwKSB7Cj4gLQkJZnVzYjMwMl9sb2coY2hpcCwgImNhbm5vdCBzdG9w IHRvZ2dsaW5nLCByZXQ9JWQiLCByZXQpOwo+IC0JCWdvdG8gZG9uZTsKPiAtCX0KPiArCj4gKwlm dXNiMzAyX2xvZyhjaGlwLCAiY2MgOj0gJXMiLCB0eXBlY19jY19zdGF0dXNfbmFtZVtjY10pOwo+ ICsKPiAgCXJldCA9IGZ1c2IzMDJfc2V0X2NjX3B1bGwoY2hpcCwgcHVsbF91cCwgcHVsbF9kb3du KTsKPiAgCWlmIChyZXQgPCAwKSB7Cj4gIAkJZnVzYjMwMl9sb2coY2hpcCwKPiBAQCAtNzE4LDc0 ICs3MTgsMTkgQEAgc3RhdGljIGludCB0Y3BtX3NldF9jYyhzdHJ1Y3QgdGNwY19kZXYgKmRldiwg ZW51bSB0eXBlY19jY19zdGF0dXMgY2MpCj4gIAkvKiByZXNldCB0aGUgY2Mgc3RhdHVzICovCj4g IAljaGlwLT5jYzEgPSBUWVBFQ19DQ19PUEVOOwo+ICAJY2hpcC0+Y2MyID0gVFlQRUNfQ0NfT1BF TjsKPiArCj4gIAkvKiBhZGp1c3QgY3VycmVudCBmb3IgU1JDICovCj4gLQlpZiAocHVsbF91cCkg ewo+IC0JCXJldCA9IGZ1c2IzMDJfc2V0X3NyY19jdXJyZW50KGNoaXAsIGNjX3NyY19jdXJyZW50 W2NjXSk7Cj4gLQkJaWYgKHJldCA8IDApIHsKPiAtCQkJZnVzYjMwMl9sb2coY2hpcCwgImNhbm5v dCBzZXQgc3JjIGN1cnJlbnQgJXMsIHJldD0lZCIsCj4gLQkJCQkgICAgdHlwZWNfY2Nfc3RhdHVz X25hbWVbY2NdLCByZXQpOwo+IC0JCQlnb3RvIGRvbmU7Cj4gLQkJfQo+IC0JfQo+IC0JLyogZW5h YmxlL2Rpc2FibGUgaW50ZXJydXB0cywgQkNfTFZMIGZvciBTTksgYW5kIENPTVBfQ0hORyBmb3Ig U1JDICovCj4gLQlpZiAocHVsbF91cCkgewo+IC0JCXJkX21kYSA9IHJkX21kYV92YWx1ZVtjY19z cmNfY3VycmVudFtjY11dOwo+IC0JCXJldCA9IGZ1c2IzMDJfaTJjX3dyaXRlKGNoaXAsIEZVU0Jf UkVHX01FQVNVUkUsIHJkX21kYSk7Cj4gLQkJaWYgKHJldCA8IDApIHsKPiAtCQkJZnVzYjMwMl9s b2coY2hpcCwKPiAtCQkJCSAgICAiY2Fubm90IHNldCBTUkMgbWVhc3VyZSB2YWx1ZSwgcmV0PSVk IiwKPiAtCQkJCSAgICByZXQpOwo+IC0JCQlnb3RvIGRvbmU7Cj4gLQkJfQo+IC0JCXJldCA9IGZ1 c2IzMDJfaTJjX21hc2tfd3JpdGUoY2hpcCwgRlVTQl9SRUdfTUFTSywKPiAtCQkJCQkgICAgIEZV U0JfUkVHX01BU0tfQkNfTFZMIHwKPiAtCQkJCQkgICAgIEZVU0JfUkVHX01BU0tfQ09NUF9DSE5H LAo+IC0JCQkJCSAgICAgRlVTQl9SRUdfTUFTS19DT01QX0NITkcpOwo+IC0JCWlmIChyZXQgPCAw KSB7Cj4gLQkJCWZ1c2IzMDJfbG9nKGNoaXAsICJjYW5ub3Qgc2V0IFNSQyBpbnRlcnJ1cHQsIHJl dD0lZCIsCj4gLQkJCQkgICAgcmV0KTsKPiAtCQkJZ290byBkb25lOwo+IC0JCX0KPiAtCQljaGlw LT5pbnRyX2JjX2x2bCA9IGZhbHNlOwo+IC0JCWNoaXAtPmludHJfY29tcF9jaG5nID0gdHJ1ZTsK PiAtCX0KPiAtCWlmIChwdWxsX2Rvd24pIHsKPiAtCQlyZXQgPSBmdXNiMzAyX2kyY19tYXNrX3dy aXRlKGNoaXAsIEZVU0JfUkVHX01BU0ssCj4gLQkJCQkJICAgICBGVVNCX1JFR19NQVNLX0JDX0xW TCB8Cj4gLQkJCQkJICAgICBGVVNCX1JFR19NQVNLX0NPTVBfQ0hORywKPiAtCQkJCQkgICAgIEZV U0JfUkVHX01BU0tfQkNfTFZMKTsKPiAtCQlpZiAocmV0IDwgMCkgewo+IC0JCQlmdXNiMzAyX2xv ZyhjaGlwLCAiY2Fubm90IHNldCBTUkMgaW50ZXJydXB0LCByZXQ9JWQiLAo+IC0JCQkJICAgIHJl dCk7Cj4gLQkJCWdvdG8gZG9uZTsKPiAtCQl9Cj4gLQkJY2hpcC0+aW50cl9iY19sdmwgPSB0cnVl Owo+IC0JCWNoaXAtPmludHJfY29tcF9jaG5nID0gZmFsc2U7Cj4gKwlyZXQgPSBmdXNiMzAyX3Nl dF9zcmNfY3VycmVudChjaGlwLCBjY19zcmNfY3VycmVudFtjY10pOwo+ICsJaWYgKHJldCA8IDAp IHsKPiArCQlmdXNiMzAyX2xvZyhjaGlwLCAiY2Fubm90IHNldCBzcmMgY3VycmVudCAlcywgcmV0 PSVkIiwKPiArCQkJICAgIHR5cGVjX2NjX3N0YXR1c19uYW1lW2NjXSwgcmV0KTsKPiArCQlnb3Rv IGRvbmU7Cj4gIAl9Cj4gLQlmdXNiMzAyX2xvZyhjaGlwLCAiY2MgOj0gJXMiLCB0eXBlY19jY19z dGF0dXNfbmFtZVtjY10pOwo+ICAKPiAtCS8qIEVuYWJsZSBkZXRlY3Rpb24gZm9yIGZpeGVkIFNO SyBvciBTUkMgb25seSByb2xlcyAqLwo+IC0Jc3dpdGNoIChjYykgewo+IC0JY2FzZSBUWVBFQ19D Q19SRDoKPiAtCQltb2RlID0gVE9HR0xJTkdfTU9ERV9TTks7Cj4gLQkJYnJlYWs7Cj4gLQljYXNl IFRZUEVDX0NDX1JQX0RFRjoKPiAtCWNhc2UgVFlQRUNfQ0NfUlBfMV81Ogo+IC0JY2FzZSBUWVBF Q19DQ19SUF8zXzA6Cj4gLQkJbW9kZSA9IFRPR0dMSU5HX01PREVfU1JDOwo+IC0JCWJyZWFrOwo+ IC0JZGVmYXVsdDoKPiAtCQltb2RlID0gVE9HR0xJTkdfTU9ERV9PRkY7Cj4gLQkJYnJlYWs7Cj4g LQl9Cj4gKwlyZXQgPSBmdXNiMzAyX3NldF90b2dnbGluZyhjaGlwLCBtb2RlKTsKPiArCWlmIChy ZXQgPCAwKQo+ICsJCWZ1c2IzMDJfbG9nKGNoaXAsICJjYW5ub3Qgc2V0IHRvZ2dsaW5nIG1vZGUs IHJldD0lZCIsIHJldCk7Cj4gIAo+IC0JaWYgKG1vZGUgIT0gVE9HR0xJTkdfTU9ERV9PRkYpIHsK PiAtCQlyZXQgPSBmdXNiMzAyX3NldF90b2dnbGluZyhjaGlwLCBtb2RlKTsKPiAtCQlpZiAocmV0 IDwgMCkKPiAtCQkJZnVzYjMwMl9sb2coY2hpcCwKPiAtCQkJCSAgICAiY2Fubm90IHNldCBmaXhl ZCByb2xlIHRvZ2dsaW5nIG1vZGUsIHJldD0lZCIsCj4gLQkJCQkgICAgcmV0KTsKPiAtCX0KPiAg ZG9uZToKPiAgCW11dGV4X3VubG9jaygmY2hpcC0+bG9jayk7Cj4gIAo+IC0tIAo+IDIuMjAuMQo+ Cg==