From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 13/13] drm/i915: Trim some if-else braces Date: Wed, 29 Jun 2016 16:09:32 +0100 Message-ID: <1467212972-861-13-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467212972-861-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id BC7C76E724 for ; Wed, 29 Jun 2016 15:09:51 +0000 (UTC) In-Reply-To: <1467212972-861-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkp1c3QgYSBi aXQgb2YgY2xlYW51cCBhZnRlciB0aGUgcHJldmlvdXMgcmVmYWN0b3JpbmcuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDE1ICsrKysrKy0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggN2JiYzU5ZWVmMjY3Li4wZGY3YTEz YzA5OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTMxMTMs MjAgKzMxMTMsMTggQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJCWVuZ2luZS0+d3JpdGVf dGFpbCA9IGdlbjZfYnNkX3Jpbmdfd3JpdGVfdGFpbDsKIAkJZW5naW5lLT5mbHVzaCA9IGdlbjZf YnNkX3JpbmdfZmx1c2g7Ci0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKKwkJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkKIAkJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0K IAkJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1MxX0lSUV9TSElGVDsKLQkJ fSBlbHNlIHsKKwkJZWxzZQogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNF Ul9JTlRFUlJVUFQ7Ci0JCX0KIAl9IGVsc2UgewogCQllbmdpbmUtPm1taW9fYmFzZSA9IEJTRF9S SU5HX0JBU0U7CiAJCWVuZ2luZS0+Zmx1c2ggPSBic2RfcmluZ19mbHVzaDsKLQkJaWYgKElTX0dF TjUoZGV2X3ByaXYpKSB7CisJCWlmIChJU19HRU41KGRldl9wcml2KSkKIAkJCWVuZ2luZS0+aXJx X2VuYWJsZV9tYXNrID0gSUxLX0JTRF9VU0VSX0lOVEVSUlVQVDsKLQkJfSBlbHNlIHsKKwkJZWxz ZQogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBJOTE1X0JTRF9VU0VSX0lOVEVSUlVQVDsK LQkJfQogCX0KIAogCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsK QEAgLTMxNjksMTIgKzMxNjcsMTEgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJp diwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3JpbmdfZmx1c2g7Ci0JaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOCkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQ VCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7Ci0JfSBlbHNlIHsKKwllbHNlCiAJCWVuZ2luZS0+aXJx X2VuYWJsZV9tYXNrID0gR1RfQkxUX1VTRVJfSU5URVJSVVBUOwotCX0KIAogCXJldHVybiBpbnRl bF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsKIH0KLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK