From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [PATCH v2 38/60] drm/omap: dss: Cleanup error paths in output init functions Date: Sat, 26 May 2018 20:24:56 +0300 Message-ID: <20180526172518.18710-39-laurent.pinchart@ideasonboard.com> References: <20180526172518.18710-1-laurent.pinchart@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13FE66E3DE for ; Sat, 26 May 2018 17:25:58 +0000 (UTC) In-Reply-To: <20180526172518.18710-1-laurent.pinchart@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Tomi Valkeinen List-Id: dri-devel@lists.freedesktop.org UmVuYW1lIHRoZSBqdW1wIGxhYmVscyBhY2NvcmRpbmcgdG8gdGhlIGNsZWFudXAgdGhleSBwZXJm b3JtLCBub3QgdGhlCmxvY2F0aW9uIHRoZXkncmUgYWNjZXNzZWQgZnJvbSwgYW5kIG1vdmUgZnVu Y3Rpb25zIGZyb20gZXJyb3IgY2hlY2tzIHRvCmNsZWFudXAgcGF0aHMsIGFuZCBtb3ZlIHJlZmVy ZW5jZSBoYW5kbGluZyB0byBzaW1wbGlmeSBjbGVhbnVwLgoKU2lnbmVkLW9mZi1ieTogTGF1cmVu dCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9kcGkuYyAgIHwgMTAgKystLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL29tYXBkcm0vZHNzL2RzaS5jICAgfCAgOSArKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9vbWFwZHJtL2Rzcy9oZG1pNC5jIHwgIDcgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL29tYXBk cm0vZHNzL2hkbWk1LmMgfCAgNyArKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3Mv c2RpLmMgICB8ICA3ICsrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy92ZW5jLmMg IHwgIDcgKysrLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHBpLmMg Yi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHBpLmMKaW5kZXggOGE3Yzk1MWE0MTNjLi5l OTdmNTRkNWYzZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9kcGku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHBpLmMKQEAgLTc0NSwxNSArNzQ1 LDE0IEBAIGludCBkcGlfaW5pdF9wb3J0KHN0cnVjdCBkc3NfZGV2aWNlICpkc3MsIHN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYsCiAJCXJldHVybiAwOwogCiAJciA9IG9mX3Byb3BlcnR5X3Jl YWRfdTMyKGVwLCAiZGF0YS1saW5lcyIsICZkYXRhbGluZXMpOworCW9mX25vZGVfcHV0KGVwKTsK IAlpZiAocikgewogCQlEU1NFUlIoImZhaWxlZCB0byBwYXJzZSBkYXRhbGluZXNcbiIpOwotCQln b3RvIGVycl9kYXRhbGluZXM7CisJCXJldHVybiByOwogCX0KIAogCWRwaS0+ZGF0YV9saW5lcyA9 IGRhdGFsaW5lczsKIAotCW9mX25vZGVfcHV0KGVwKTsKLQogCWRwaS0+cGRldiA9IHBkZXY7CiAJ ZHBpLT5kc3NfbW9kZWwgPSBkc3NfbW9kZWw7CiAJZHBpLT5kc3MgPSBkc3M7CkBAIC03NjQsMTEg Kzc2Myw2IEBAIGludCBkcGlfaW5pdF9wb3J0KHN0cnVjdCBkc3NfZGV2aWNlICpkc3MsIHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsCiAJZHBpX2luaXRfb3V0cHV0X3BvcnQoZHBpLCBwb3J0 KTsKIAogCXJldHVybiAwOwotCi1lcnJfZGF0YWxpbmVzOgotCW9mX25vZGVfcHV0KGVwKTsKLQot CXJldHVybiByOwogfQogCiB2b2lkIGRwaV91bmluaXRfcG9ydChzdHJ1Y3QgZGV2aWNlX25vZGUg KnBvcnQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHNpLmMgYi9k cml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHNpLmMKaW5kZXggYjNlNTBkOGE3NDc3Li4yNzgw OTRmMjkyNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9kc2kuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvZHNpLmMKQEAgLTUzNjAsNyArNTM2MCw3 IEBAIHN0YXRpYyBpbnQgZHNpX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNl ICptYXN0ZXIsIHZvaWQgKmRhdGEpCiAKIAlyID0gZHNpX3J1bnRpbWVfZ2V0KGRzaSk7CiAJaWYg KHIpCi0JCWdvdG8gZXJyX3J1bnRpbWVfZ2V0OworCQlnb3RvIGVycl9wbV9kaXNhYmxlOwogCiAJ cmV2ID0gZHNpX3JlYWRfcmVnKGRzaSwgRFNJX1JFVklTSU9OKTsKIAlkZXZfZGJnKGRldiwgIk9N QVAgRFNJIHJldiAlZC4lZFxuIiwKQEAgLTUzODEsNyArNTM4MSw3IEBAIHN0YXRpYyBpbnQgZHNp X2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRh dGEpCiAJciA9IGRzaV9wcm9iZV9vZihkc2kpOwogCWlmIChyKSB7CiAJCURTU0VSUigiSW52YWxp ZCBEU0kgRFQgZGF0YVxuIik7Ci0JCWdvdG8gZXJyX3Byb2JlX29mOworCQlnb3RvIGVycl91bmlu aXRfb3V0cHV0OwogCX0KIAogCXIgPSBvZl9wbGF0Zm9ybV9wb3B1bGF0ZShkZXYtPm9mX25vZGUs IE5VTEwsIE5VTEwsIGRldik7CkBAIC01NDA0LDExICs1NDA0LDEwIEBAIHN0YXRpYyBpbnQgZHNp X2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRh dGEpCiAKIAlyZXR1cm4gMDsKIAotZXJyX3Byb2JlX29mOgorZXJyX3VuaW5pdF9vdXRwdXQ6CiAJ ZHNpX3VuaW5pdF9vdXRwdXQoZHNpKTsKIAlkc2lfcnVudGltZV9wdXQoZHNpKTsKLQotZXJyX3J1 bnRpbWVfZ2V0OgorZXJyX3BtX2Rpc2FibGU6CiAJcG1fcnVudGltZV9kaXNhYmxlKGRldik7CiAJ cmV0dXJuIHI7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvaGRt aTQuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9oZG1pNC5jCmluZGV4IGJmODAwY2Vk ZTJhZC4uMWQxZjJlMGIyYjJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9k c3MvaGRtaTQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvaGRtaTQuYwpAQCAt NzgwLDkgKzc4MCw3IEBAIHN0YXRpYyBpbnQgaGRtaTRfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYs IHN0cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkKIAlyID0gaGRtaV9hdWRpb19yZWdp c3RlcihoZG1pKTsKIAlpZiAocikgewogCQlEU1NFUlIoIlJlZ2lzdGVyaW5nIEhETUkgYXVkaW8g ZmFpbGVkXG4iKTsKLQkJaGRtaV91bmluaXRfb3V0cHV0KGhkbWkpOwotCQlwbV9ydW50aW1lX2Rp c2FibGUoJnBkZXYtPmRldik7Ci0JCXJldHVybiByOworCQlnb3RvIGVycl91bmluaXRfb3V0cHV0 OwogCX0KIAogCWhkbWktPmRlYnVnZnMgPSBkc3NfZGVidWdmc19jcmVhdGVfZmlsZShkc3MsICJo ZG1pIiwgaGRtaV9kdW1wX3JlZ3MsCkBAIC03OTAsNiArNzg4LDkgQEAgc3RhdGljIGludCBoZG1p NF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLCB2b2lkICpk YXRhKQogCiAJcmV0dXJuIDA7CiAKK2Vycl91bmluaXRfb3V0cHV0OgorCWhkbWlfdW5pbml0X291 dHB1dChoZG1pKTsKKwlwbV9ydW50aW1lX2Rpc2FibGUoJnBkZXYtPmRldik7CiBlcnJfcGxsOgog CWhkbWlfcGxsX3VuaW5pdCgmaGRtaS0+cGxsKTsKIGVycl9mcmVlOgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL29tYXBkcm0vZHNzL2hkbWk1LmMgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRy bS9kc3MvaGRtaTUuYwppbmRleCBlNWQyM2RkMTlmOTkuLjkyYWU1NjFiZjk3NCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vZHNzL2hkbWk1LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL29tYXBkcm0vZHNzL2hkbWk1LmMKQEAgLTc3Myw5ICs3NzMsNyBAQCBzdGF0aWMgaW50IGhk bWk1X2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQg KmRhdGEpCiAJciA9IGhkbWlfYXVkaW9fcmVnaXN0ZXIoaGRtaSk7CiAJaWYgKHIpIHsKIAkJRFNT RVJSKCJSZWdpc3RlcmluZyBIRE1JIGF1ZGlvIGZhaWxlZCAlZFxuIiwgcik7Ci0JCWhkbWlfdW5p bml0X291dHB1dChoZG1pKTsKLQkJcG1fcnVudGltZV9kaXNhYmxlKCZwZGV2LT5kZXYpOwotCQly ZXR1cm4gcjsKKwkJZ290byBlcnJfdW5pbml0X291dHB1dDsKIAl9CiAKIAloZG1pLT5kZWJ1Z2Zz ID0gZHNzX2RlYnVnZnNfY3JlYXRlX2ZpbGUoZHNzLCAiaGRtaSIsIGhkbWlfZHVtcF9yZWdzLApA QCAtNzgzLDYgKzc4MSw5IEBAIHN0YXRpYyBpbnQgaGRtaTVfYmluZChzdHJ1Y3QgZGV2aWNlICpk ZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkKIAogCXJldHVybiAwOwogCitl cnJfdW5pbml0X291dHB1dDoKKwloZG1pX3VuaW5pdF9vdXRwdXQoaGRtaSk7CisJcG1fcnVudGlt ZV9kaXNhYmxlKCZwZGV2LT5kZXYpOwogZXJyX3BsbDoKIAloZG1pX3BsbF91bmluaXQoJmhkbWkt PnBsbCk7CiBlcnJfZnJlZToKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rz cy9zZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9zZGkuYwppbmRleCBmZDUzMjAw NDE5MTEuLjBhY2U1NTNhMjFjNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0v ZHNzL3NkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9zZGkuYwpAQCAtMzU1 LDE2ICszNTUsMTUgQEAgaW50IHNkaV9pbml0X3BvcnQoc3RydWN0IGRzc19kZXZpY2UgKmRzcywg c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwKIAl9CiAKIAlyID0gb2ZfcHJvcGVydHlfcmVh ZF91MzIoZXAsICJkYXRhcGFpcnMiLCAmZGF0YXBhaXJzKTsKKwlvZl9ub2RlX3B1dChlcCk7CiAJ aWYgKHIpIHsKIAkJRFNTRVJSKCJmYWlsZWQgdG8gcGFyc2UgZGF0YXBhaXJzXG4iKTsKLQkJZ290 byBlcnJfZGF0YXBhaXJzOworCQlnb3RvIGVycl9mcmVlOwogCX0KIAogCXNkaS0+ZGF0YXBhaXJz ID0gZGF0YXBhaXJzOwogCXNkaS0+ZHNzID0gZHNzOwogCi0Jb2Zfbm9kZV9wdXQoZXApOwotCiAJ c2RpLT5wZGV2ID0gcGRldjsKIAlwb3J0LT5kYXRhID0gc2RpOwogCkBAIC0zNzIsOCArMzcxLDYg QEAgaW50IHNkaV9pbml0X3BvcnQoc3RydWN0IGRzc19kZXZpY2UgKmRzcywgc3RydWN0IHBsYXRm b3JtX2RldmljZSAqcGRldiwKIAogCXJldHVybiAwOwogCi1lcnJfZGF0YXBhaXJzOgotCW9mX25v ZGVfcHV0KGVwKTsKIGVycl9mcmVlOgogCWtmcmVlKHNkaSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy92ZW5jLmMgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9k c3MvdmVuYy5jCmluZGV4IDQ3OTg1NTQ5YTgxYy4uYzhmYjkxYmIxYWQzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vb21hcGRybS9kc3MvdmVuYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9v bWFwZHJtL2Rzcy92ZW5jLmMKQEAgLTg2Nyw3ICs4NjcsNyBAQCBzdGF0aWMgaW50IHZlbmNfYmlu ZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkK IAogCXIgPSB2ZW5jX3J1bnRpbWVfZ2V0KHZlbmMpOwogCWlmIChyKQotCQlnb3RvIGVycl9ydW50 aW1lX2dldDsKKwkJZ290byBlcnJfcG1fZGlzYWJsZTsKIAogCXJldl9pZCA9ICh1OCkodmVuY19y ZWFkX3JlZyh2ZW5jLCBWRU5DX1JFVl9JRCkgJiAweGZmKTsKIAlkZXZfZGJnKCZwZGV2LT5kZXYs ICJPTUFQIFZFTkMgcmV2ICVkXG4iLCByZXZfaWQpOwpAQCAtODc3LDcgKzg3Nyw3IEBAIHN0YXRp YyBpbnQgdmVuY19iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVy LCB2b2lkICpkYXRhKQogCXIgPSB2ZW5jX3Byb2JlX29mKHZlbmMpOwogCWlmIChyKSB7CiAJCURT U0VSUigiSW52YWxpZCBEVCBkYXRhXG4iKTsKLQkJZ290byBlcnJfcHJvYmVfb2Y7CisJCWdvdG8g ZXJyX3BtX2Rpc2FibGU7CiAJfQogCiAJdmVuYy0+ZGVidWdmcyA9IGRzc19kZWJ1Z2ZzX2NyZWF0 ZV9maWxlKGRzcywgInZlbmMiLCB2ZW5jX2R1bXBfcmVncywKQEAgLTg4Nyw4ICs4ODcsNyBAQCBz dGF0aWMgaW50IHZlbmNfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1h c3Rlciwgdm9pZCAqZGF0YSkKIAogCXJldHVybiAwOwogCi1lcnJfcHJvYmVfb2Y6Ci1lcnJfcnVu dGltZV9nZXQ6CitlcnJfcG1fZGlzYWJsZToKIAlwbV9ydW50aW1lX2Rpc2FibGUoJnBkZXYtPmRl dik7CiBlcnJfZnJlZToKIAlrZnJlZSh2ZW5jKTsKLS0gClJlZ2FyZHMsCgpMYXVyZW50IFBpbmNo YXJ0CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK