From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: [PATCH 2/3] drm/i915: Remove pointless goto fail
Date: Wed,  7 Nov 2018 23:35:21 +0200
Message-ID: <20181107213522.17590-2-ville.syrjala@linux.intel.com>
References: <20181107213522.17590-1-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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 3118A6E50F
 for <intel-gfx@lists.freedesktop.org>; Wed,  7 Nov 2018 21:35:29 +0000 (UTC)
In-Reply-To: <20181107213522.17590-1-ville.syrjala@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl
IGp1c3QgJ3JldHVybiByZXQnIGltbWVkaWF0ZWx5IGFmdGVyIGp1bXBpbmcgdG8gdGhlIGxhYmVs
LiBMZXQncwpyZXR1cm4gZGlyZWN0bHkgaW5zdGVhZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5
cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjEgKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZp
bGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZGU5ODliNDI2NWI2Li4yYWYxNDI4NjBiNzMgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMjk3LDcgKzExMjk3LDcgQEAg
aW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0
IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv
cjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwotCWludCBi
YXNlX2JwcCwgcmV0ID0gLUVJTlZBTDsKKwlpbnQgYmFzZV9icHAsIHJldDsKIAlpbnQgaTsKIAli
b29sIHJldHJ5ID0gdHJ1ZTsKIApAQCAtMTEzMjIsNyArMTEzMjIsNyBAQCBpbnRlbF9tb2Rlc2V0
X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAliYXNlX2JwcCA9IGNvbXB1dGVf
YmFzZWxpbmVfcGlwZV9icHAodG9faW50ZWxfY3J0YyhjcnRjKSwKIAkJCQkJICAgICBwaXBlX2Nv
bmZpZyk7CiAJaWYgKGJhc2VfYnBwIDwgMCkKLQkJZ290byBmYWlsOworCQlyZXR1cm4gLUVJTlZB
TDsKIAogCS8qCiAJICogRGV0ZXJtaW5lIHRoZSByZWFsIHBpcGUgZGltZW5zaW9ucy4gTm90ZSB0
aGF0IHN0ZXJlbyBtb2RlcyBjYW4KQEAgLTExMzQ0LDcgKzExMzQ0LDcgQEAgaW50ZWxfbW9kZXNl
dF9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAkJaWYgKCFjaGVja19zaW5n
bGVfZW5jb2Rlcl9jbG9uaW5nKHN0YXRlLCB0b19pbnRlbF9jcnRjKGNydGMpLCBlbmNvZGVyKSkg
ewogCQkJRFJNX0RFQlVHX0tNUygicmVqZWN0aW5nIGludmFsaWQgY2xvbmluZyBjb25maWd1cmF0
aW9uXG4iKTsKLQkJCWdvdG8gZmFpbDsKKwkJCXJldHVybiAtRUlOVkFMOwogCQl9CiAKIAkJLyoK
QEAgLTExMzgwLDcgKzExMzgwLDcgQEAgaW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhzdHJ1Y3Qg
ZHJtX2NydGMgKmNydGMsCiAKIAkJaWYgKCEoZW5jb2Rlci0+Y29tcHV0ZV9jb25maWcoZW5jb2Rl
ciwgcGlwZV9jb25maWcsIGNvbm5lY3Rvcl9zdGF0ZSkpKSB7CiAJCQlEUk1fREVCVUdfS01TKCJF
bmNvZGVyIGNvbmZpZyBmYWlsdXJlXG4iKTsKLQkJCWdvdG8gZmFpbDsKKwkJCXJldHVybiAtRUlO
VkFMOwogCQl9CiAJfQogCkBAIC0xMTM5MiwxNyArMTEzOTIsMTUgQEAgaW50ZWxfbW9kZXNldF9w
aXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlyZXQgPSBpbnRlbF9jcnRjX2Nv
bXB1dGVfY29uZmlnKHRvX2ludGVsX2NydGMoY3J0YyksIHBpcGVfY29uZmlnKTsKIAlpZiAocmV0
ID09IC1FREVBRExLKQotCQlnb3RvIGZhaWw7CisJCXJldHVybiByZXQ7CiAJaWYgKHJldCA8IDAp
IHsKIAkJRFJNX0RFQlVHX0tNUygiQ1JUQyBmaXh1cCBmYWlsZWRcbiIpOwotCQlnb3RvIGZhaWw7
CisJCXJldHVybiByZXQ7CiAJfQogCiAJaWYgKHJldCA9PSBSRVRSWSkgewotCQlpZiAoV0FSTigh
cmV0cnksICJsb29wIGluIHBpcGUgY29uZmlndXJhdGlvbiBjb21wdXRhdGlvblxuIikpIHsKLQkJ
CXJldCA9IC1FSU5WQUw7Ci0JCQlnb3RvIGZhaWw7Ci0JCX0KKwkJaWYgKFdBUk4oIXJldHJ5LCAi
bG9vcCBpbiBwaXBlIGNvbmZpZ3VyYXRpb24gY29tcHV0YXRpb25cbiIpKQorCQkJcmV0dXJuIC1F
SU5WQUw7CiAKIAkJRFJNX0RFQlVHX0tNUygiQ1JUQyBidyBjb25zdHJhaW5lZCwgcmV0cnlpbmdc
biIpOwogCQlyZXRyeSA9IGZhbHNlOwpAQCAtMTE0MTgsOCArMTE0MTYsNyBAQCBpbnRlbF9tb2Rl
c2V0X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlEUk1fREVCVUdfS01TKCJo
dyBtYXggYnBwOiAlaSwgcGlwZSBicHA6ICVpLCBkaXRoZXJpbmc6ICVpXG4iLAogCQkgICAgICBi
YXNlX2JwcCwgcGlwZV9jb25maWctPnBpcGVfYnBwLCBwaXBlX2NvbmZpZy0+ZGl0aGVyKTsKIAot
ZmFpbDoKLQlyZXR1cm4gcmV0OworCXJldHVybiAwOwogfQogCiBzdGF0aWMgYm9vbCBpbnRlbF9m
dXp6eV9jbG9ja19jaGVjayhpbnQgY2xvY2sxLCBpbnQgY2xvY2syKQotLSAKMi4xOC4xCgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m
cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK