From: Ville Syrjala Subject: [PATCH v2 10/10] drm/i915: Drop the redundant hdmi prefix/suffix from a lot of variables Date: Wed, 18 Oct 2017 21:19:58 +0300 Message-ID: <20171018181958.4423-1-ville.syrjala@linux.intel.com> References: <20171016145705.11780-11-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 725266E936 for ; Wed, 18 Oct 2017 18:20:03 +0000 (UTC) In-Reply-To: <20171016145705.11780-11-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkEg YnVuY2ggb2YgZnVuY3Rpb25zIGFyZSBub3cgZXhjbHVzaXZlbHkgdXNlZCBmb3IgSERNSSwgc28g bmFtaW5nIHRoZQp2YXJpYWJsZXMgd2l0aCBoZG1pIHByZWZpeC9zdWZmaXggaXMgcmVkdW5kYW50 LiBBbHNvIHVzZSBpbnQgcmF0aGVyCnRoYW4gdTMyIGZvciB0aGUgdHJhbnNsYXRpb24gbGV2ZWwg Y29uc2lzdGVudGx5LgoKdjI6IFJlYmFzZSBkdWUgdG8gaGRtaV9sZXZlbD0tMSBhdm9pZGFuY2UK CkNjOiBKYW1lcyBBdXNtdXMgPGphbWVzLmF1c211c0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA2MyArKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMzMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRp LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCBjZDdhMGQ5NzlhMTAu LmI4OTI1YmM4MmYzMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRp LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTc3MCw0MyArNzcw LDQwIEBAIGNubF9nZXRfYnVmX3RyYW5zX2VkcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGludCAqbl9lbnRyaWVzKQogCiBzdGF0aWMgaW50IGludGVsX2RkaV9oZG1pX2xldmVs KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpCiB7Ci0J aW50IG5faGRtaV9lbnRyaWVzOwotCWludCBoZG1pX2xldmVsOwotCWludCBoZG1pX2RlZmF1bHRf ZW50cnk7CisJaW50IG5fZW50cmllcywgbGV2ZWwsIGRlZmF1bHRfZW50cnk7CiAKLQloZG1pX2xl dmVsID0gZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZvW3BvcnRdLmhkbWlfbGV2ZWxfc2hpZnQ7 CisJbGV2ZWwgPSBkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bcG9ydF0uaGRtaV9sZXZlbF9z aGlmdDsKIAogCWlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQljbmxfZ2V0X2J1Zl90 cmFuc19oZG1pKGRldl9wcml2LCAmbl9oZG1pX2VudHJpZXMpOwotCQloZG1pX2RlZmF1bHRfZW50 cnkgPSBuX2hkbWlfZW50cmllcyAtIDE7CisJCWNubF9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3By aXYsICZuX2VudHJpZXMpOworCQlkZWZhdWx0X2VudHJ5ID0gbl9lbnRyaWVzIC0gMTsKIAl9IGVs c2UgaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpKSB7Ci0JCWJ4dF9nZXRfYnVmX3RyYW5zX2hkbWko ZGV2X3ByaXYsICZuX2hkbWlfZW50cmllcyk7Ci0JCWhkbWlfZGVmYXVsdF9lbnRyeSA9IG5faGRt aV9lbnRyaWVzIC0gMTsKKwkJYnh0X2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50 cmllcyk7CisJCWRlZmF1bHRfZW50cnkgPSBuX2VudHJpZXMgLSAxOwogCX0gZWxzZSBpZiAoSVNf R0VOOV9CQyhkZXZfcHJpdikpIHsKLQkJaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZf cHJpdiwgJm5faGRtaV9lbnRyaWVzKTsKLQkJaGRtaV9kZWZhdWx0X2VudHJ5ID0gODsKKwkJaW50 ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJCWRlZmF1 bHRfZW50cnkgPSA4OwogCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewotCQlp bnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9oZG1pX2VudHJpZXMpOwot CQloZG1pX2RlZmF1bHRfZW50cnkgPSA3OworCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1p KGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJZGVmYXVsdF9lbnRyeSA9IDc7CiAJfSBlbHNlIGlm IChJU19IQVNXRUxMKGRldl9wcml2KSkgewotCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1p KGRldl9wcml2LCAmbl9oZG1pX2VudHJpZXMpOwotCQloZG1pX2RlZmF1bHRfZW50cnkgPSA2Owor CQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJ ZGVmYXVsdF9lbnRyeSA9IDY7CiAJfSBlbHNlIHsKIAkJV0FSTigxLCAiZGRpIHRyYW5zbGF0aW9u IHRhYmxlIG1pc3NpbmdcbiIpOwogCQlyZXR1cm4gMDsKIAl9CiAKIAkvKiBDaG9vc2UgYSBnb29k IGRlZmF1bHQgaWYgVkJUIGlzIGJhZGx5IHBvcHVsYXRlZCAqLwotCWlmIChoZG1pX2xldmVsID09 IEhETUlfTEVWRUxfU0hJRlRfVU5LTk9XTiB8fAotCSAgICBoZG1pX2xldmVsID49IG5faGRtaV9l bnRyaWVzKQotCQloZG1pX2xldmVsID0gaGRtaV9kZWZhdWx0X2VudHJ5OworCWlmIChsZXZlbCA9 PSBIRE1JX0xFVkVMX1NISUZUX1VOS05PV04gfHwgbGV2ZWwgPj0gbl9lbnRyaWVzKQorCQlsZXZl bCA9IGRlZmF1bHRfZW50cnk7CiAKLQlpZiAoV0FSTl9PTl9PTkNFKG5faGRtaV9lbnRyaWVzID09 IDApKQorCWlmIChXQVJOX09OX09OQ0Uobl9lbnRyaWVzID09IDApKQogCQlyZXR1cm4gMDsKLQlp ZiAoV0FSTl9PTl9PTkNFKGhkbWlfbGV2ZWwgPj0gbl9oZG1pX2VudHJpZXMpKQotCQloZG1pX2xl dmVsID0gbl9oZG1pX2VudHJpZXMgLSAxOworCWlmIChXQVJOX09OX09OQ0UobGV2ZWwgPj0gbl9l bnRyaWVzKSkKKwkJbGV2ZWwgPSBuX2VudHJpZXMgLSAxOwogCi0JcmV0dXJuIGhkbWlfbGV2ZWw7 CisJcmV0dXJuIGxldmVsOwogfQogCiAvKgpAQCAtODU5LDIwICs4NTYsMjAgQEAgc3RhdGljIHZv aWQgaW50ZWxfcHJlcGFyZV9kcF9kZGlfYnVmZmVycyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlcikKICAqIEhETUkvRFZJIHVzZSBjYXNlcy4KICAqLwogc3RhdGljIHZvaWQgaW50ZWxfcHJl cGFyZV9oZG1pX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAotCQkJ CQkgICBpbnQgaGRtaV9sZXZlbCkKKwkJCQkJICAgaW50IGxldmVsKQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXUz MiBpYm9vc3RfYml0ID0gMDsKLQlpbnQgbl9oZG1pX2VudHJpZXM7CisJaW50IG5fZW50cmllczsK IAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIpOwot CWNvbnN0IHN0cnVjdCBkZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zX2hkbWk7CisJY29u c3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnM7CiAKLQlkZGlfdHJhbnNs YXRpb25zX2hkbWkgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9o ZG1pX2VudHJpZXMpOworCWRkaV90cmFuc2xhdGlvbnMgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFu c19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKIAotCWlmIChXQVJOX09OX09OQ0UoIWRkaV90 cmFuc2xhdGlvbnNfaGRtaSkpCisJaWYgKFdBUk5fT05fT05DRSghZGRpX3RyYW5zbGF0aW9ucykp CiAJCXJldHVybjsKLQlpZiAoV0FSTl9PTl9PTkNFKGhkbWlfbGV2ZWwgPj0gbl9oZG1pX2VudHJp ZXMpKQotCQloZG1pX2xldmVsID0gbl9oZG1pX2VudHJpZXMgLSAxOworCWlmIChXQVJOX09OX09O Q0UobGV2ZWwgPj0gbl9lbnRyaWVzKSkKKwkJbGV2ZWwgPSBuX2VudHJpZXMgLSAxOwogCiAJLyog SWYgd2UncmUgYm9vc3RpbmcgdGhlIGN1cnJlbnQsIHNldCBiaXQgMzEgb2YgdHJhbnMxICovCiAJ aWYgKElTX0dFTjlfQkMoZGV2X3ByaXYpICYmCkBAIC04ODEsOSArODc4LDkgQEAgc3RhdGljIHZv aWQgaW50ZWxfcHJlcGFyZV9oZG1pX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCiAJLyogRW50cnkgOSBpcyBmb3IgSERNSTogKi8KIAlJOTE1X1dSSVRFKERESV9C VUZfVFJBTlNfTE8ocG9ydCwgOSksCi0JCSAgIGRkaV90cmFuc2xhdGlvbnNfaGRtaVtoZG1pX2xl dmVsXS50cmFuczEgfCBpYm9vc3RfYml0KTsKKwkJICAgZGRpX3RyYW5zbGF0aW9uc1tsZXZlbF0u dHJhbnMxIHwgaWJvb3N0X2JpdCk7CiAJSTkxNV9XUklURShERElfQlVGX1RSQU5TX0hJKHBvcnQs IDkpLAotCQkgICBkZGlfdHJhbnNsYXRpb25zX2hkbWlbaGRtaV9sZXZlbF0udHJhbnMyKTsKKwkJ ICAgZGRpX3RyYW5zbGF0aW9uc1tsZXZlbF0udHJhbnMyKTsKIH0KIAogc3RhdGljIHZvaWQgaW50 ZWxfd2FpdF9kZGlfYnVmX2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApA QCAtMjA5Niw3ICsyMDkzLDcgQEAgdTMyIGJ4dF9zaWduYWxfbGV2ZWxzKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZHBvcnQgPSBkcF90b19k aWdfcG9ydChpbnRlbF9kcCk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkcG9ydC0+YmFzZS5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIgPSAmZHBvcnQtPmJhc2U7Ci0JdTMyIGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVsKGlu dGVsX2RwKTsKKwlpbnQgbGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxfZHApOwogCiAJ aWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKQogCQljbmxfZGRpX3Zzd2luZ19zZXF1ZW5jZShl bmNvZGVyLCBsZXZlbCwgZW5jb2Rlci0+dHlwZSk7CkBAIC0yMTExLDcgKzIxMDgsNyBAQCB1aW50 MzJfdCBkZGlfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCXN0cnVj dCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRwb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZHBvcnQtPmJhc2Uu YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gJmRwb3J0LT5iYXNl OwotCXVpbnQzMl90IGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVsKGludGVsX2RwKTsKKwlpbnQg bGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxfZHApOwogCiAJaWYgKElTX0dFTjlfQkMo ZGV2X3ByaXYpKQogCQlza2xfZGRpX3NldF9pYm9vc3QoZW5jb2RlciwgbGV2ZWwsIGVuY29kZXIt PnR5cGUpOwpAQCAtMjE4Myw3ICsyMTgwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGRpX3ByZV9l bmFibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJZW51bSBwb3J0IHBvcnQg PSBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChlbmNvZGVyKTsKIAlzdHJ1Y3QgaW50ZWxfZGln aXRhbF9wb3J0ICpkaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydCgmZW5jb2Rlci0+YmFzZSk7CiAJ Ym9vbCBpc19tc3QgPSBpbnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3RhdGUsIElOVEVMX09VVFBV VF9EUF9NU1QpOwotCXVpbnQzMl90IGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVsKGludGVsX2Rw KTsKKwlpbnQgbGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxfZHApOwogCiAJV0FSTl9P Tihpc19tc3QgJiYgKHBvcnQgPT0gUE9SVF9BIHx8IHBvcnQgPT0gUE9SVF9FKSk7CiAKLS0gCjIu MTMuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==