From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 06/14] drm/i915: Replace big nested if block
	with early return
Date: Mon, 18 Aug 2014 22:16:01 +0300
Message-ID: <1408389369-22898-7-git-send-email-ville.syrjala@linux.intel.com>
References: <1408389369-22898-1-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 403736E1CF
 for <intel-gfx@lists.freedesktop.org>; Mon, 18 Aug 2014 12:18:45 -0700 (PDT)
In-Reply-To: <1408389369-22898-1-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxv
b2tzIG5pY2VyLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh
QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwg
NDAgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n
ZWQsIDIwIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cC5jCmluZGV4IDE5YTgxOGYuLmU2YjRkNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAt
MTIzMiwzOCArMTIzMiwzOCBAQCBzdGF0aWMgdm9pZCBlZHBfcGFuZWxfdmRkX29mZl9zeW5jKHN0
cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGlu
dGVsX2RwX3RvX2RldihpbnRlbF9kcCk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRl
bF9kaWdfcG9ydCA9CisJCWRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKwlzdHJ1Y3QgaW50ZWxf
ZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9ICZpbnRlbF9kaWdfcG9ydC0+YmFzZTsKKwllbnVtIGlu
dGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIHBvd2VyX2RvbWFpbjsKIAl1MzIgcHA7CiAJdTMyIHBw
X3N0YXRfcmVnLCBwcF9jdHJsX3JlZzsKIAogCVdBUk5fT04oIWRybV9tb2Rlc2V0X2lzX2xvY2tl
ZCgmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KSk7CiAKLQlpZiAoIWludGVsX2Rw
LT53YW50X3BhbmVsX3ZkZCAmJiBlZHBfaGF2ZV9wYW5lbF92ZGQoaW50ZWxfZHApKSB7Ci0JCXN0
cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0KLQkJCQkJCWRwX3RvX2Rp
Z19wb3J0KGludGVsX2RwKTsKLQkJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIg
PSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7Ci0JCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21h
aW4gcG93ZXJfZG9tYWluOworCWlmIChpbnRlbF9kcC0+d2FudF9wYW5lbF92ZGQgfHwgIWVkcF9o
YXZlX3BhbmVsX3ZkZChpbnRlbF9kcCkpCisJCXJldHVybjsKIAotCQlEUk1fREVCVUdfS01TKCJU
dXJuaW5nIGVEUCBWREQgb2ZmXG4iKTsKKwlEUk1fREVCVUdfS01TKCJUdXJuaW5nIGVEUCBWREQg
b2ZmXG4iKTsKIAotCQlwcCA9IGlyb25sYWtlX2dldF9wcF9jb250cm9sKGludGVsX2RwKTsKLQkJ
cHAgJj0gfkVEUF9GT1JDRV9WREQ7CisJcHAgPSBpcm9ubGFrZV9nZXRfcHBfY29udHJvbChpbnRl
bF9kcCk7CisJcHAgJj0gfkVEUF9GT1JDRV9WREQ7CiAKLQkJcHBfY3RybF9yZWcgPSBfcHBfY3Ry
bF9yZWcoaW50ZWxfZHApOwotCQlwcF9zdGF0X3JlZyA9IF9wcF9zdGF0X3JlZyhpbnRlbF9kcCk7
CisJcHBfY3RybF9yZWcgPSBfcHBfY3RybF9yZWcoaW50ZWxfZHApOworCXBwX3N0YXRfcmVnID0g
X3BwX3N0YXRfcmVnKGludGVsX2RwKTsKIAotCQlJOTE1X1dSSVRFKHBwX2N0cmxfcmVnLCBwcCk7
Ci0JCVBPU1RJTkdfUkVBRChwcF9jdHJsX3JlZyk7CisJSTkxNV9XUklURShwcF9jdHJsX3JlZywg
cHApOworCVBPU1RJTkdfUkVBRChwcF9jdHJsX3JlZyk7CiAKLQkJLyogTWFrZSBzdXJlIHNlcXVl
bmNlciBpcyBpZGxlIGJlZm9yZSBhbGxvd2luZyBzdWJzZXF1ZW50IGFjdGl2aXR5ICovCi0JCURS
TV9ERUJVR19LTVMoIlBQX1NUQVRVUzogMHglMDh4IFBQX0NPTlRST0w6IDB4JTA4eFxuIiwKLQkJ
STkxNV9SRUFEKHBwX3N0YXRfcmVnKSwgSTkxNV9SRUFEKHBwX2N0cmxfcmVnKSk7CisJLyogTWFr
ZSBzdXJlIHNlcXVlbmNlciBpcyBpZGxlIGJlZm9yZSBhbGxvd2luZyBzdWJzZXF1ZW50IGFjdGl2
aXR5ICovCisJRFJNX0RFQlVHX0tNUygiUFBfU1RBVFVTOiAweCUwOHggUFBfQ09OVFJPTDogMHgl
MDh4XG4iLAorCUk5MTVfUkVBRChwcF9zdGF0X3JlZyksIEk5MTVfUkVBRChwcF9jdHJsX3JlZykp
OwogCi0JCWlmICgocHAgJiBQT1dFUl9UQVJHRVRfT04pID09IDApCi0JCQlpbnRlbF9kcC0+bGFz
dF9wb3dlcl9jeWNsZSA9IGppZmZpZXM7CisJaWYgKChwcCAmIFBPV0VSX1RBUkdFVF9PTikgPT0g
MCkKKwkJaW50ZWxfZHAtPmxhc3RfcG93ZXJfY3ljbGUgPSBqaWZmaWVzOwogCi0JCXBvd2VyX2Rv
bWFpbiA9IGludGVsX2Rpc3BsYXlfcG9ydF9wb3dlcl9kb21haW4oaW50ZWxfZW5jb2Rlcik7Ci0J
CWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBwb3dlcl9kb21haW4pOwotCX0KKwlw
b3dlcl9kb21haW4gPSBpbnRlbF9kaXNwbGF5X3BvcnRfcG93ZXJfZG9tYWluKGludGVsX2VuY29k
ZXIpOworCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBwb3dlcl9kb21haW4pOwog
fQogCiBzdGF0aWMgdm9pZCBlZHBfcGFuZWxfdmRkX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICpf
X3dvcmspCi0tIAoxLjguNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu
dGVsLWdmeAo=