From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH 2/2] drm/i915: fix potential dangling else
	problems in for_each_ macros
Date: Tue, 24 Nov 2015 21:21:56 +0200
Message-ID: <1448392916-2281-2-git-send-email-jani.nikula@intel.com>
References: <1448392916-2281-1-git-send-email-jani.nikula@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>
In-Reply-To: <1448392916-2281-1-git-send-email-jani.nikula@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: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, David Herrmann <dh.herrmann@gmail.com>
List-Id: intel-gfx@lists.freedesktop.org

V2UgaGF2ZSBzZXJpb3VzIGRhbmdsaW5nIGVsc2UgYnVncyB3YWl0aW5nIHRvIGhhcHBlbiBpbiBv
dXIgZm9yX2VhY2hfCnN0eWxlIG1hY3JvcyB3aXRoIGlmcy4gQ29uc2lkZXIsIGZvciBleGFtcGxl
LAoKICNkZWZpbmUgZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgbWFzaykgICAgICAgICAg
ICAgICAgICAgICAgICAgXAogICAgICAgICBmb3IgKChkb21haW4pID0gMDsgKGRvbWFpbikgPCBQ
T1dFUl9ET01BSU5fTlVNOyAoZG9tYWluKSsrKSBcCiAgICAgICAgICAgICAgICAgaWYgKCgxIDw8
IChkb21haW4pKSAmIChtYXNrKSkKCklmIHRoaXMgaXMgdXNlZCBpbiBjb250ZXh0OgoKCWlmIChj
b25kaXRpb24pCgkJZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgbWFzayk7CgllbHNlCgkJ
Zm9vKCk7Cgpmb28oKSB3aWxsIGJlIGNhbGxlZCBmb3IgZWFjaCBkb21haW4gKm5vdCogaW4gbWFz
aywgaWYgY29uZGl0aW9uIGhvbGRzLAphbmQgbm90IGF0IGFsbCBpZiBjb25kaXRpb24gZG9lc24n
dCBob2xkLgoKRml4IHRoaXMgYnkgcmV2ZXJzaW5nIHRoZSBjb25kaXRpb25zIGluIHRoZSBtYWNy
b3MsIGFuZCBhZGRpbmcgYW4gZWxzZQpicmFuY2ggZm9yIHRoZSAiZm9yIGVhY2giIGJsb2NrLCBz
byB0aGF0IG90aGVyIGlmL2Vsc2UgYmxvY2tzIGNhbid0CmludGVyZmVyZS4gUHJvdmlkZSBhICJm
b3JfZWFjaF9pZiIgaGVscGVyIG1hY3JvIHRvIG1ha2UgaXQgZWFzaWVyIHRvIGdldAp0aGlzIHJp
Z2h0LgoKdjI6IG1vdmUgZm9yX2VhY2hfaWYgdG8gZHJtUC5oIGluIGEgc2VwYXJhdGUgcGF0Y2gu
CgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KU2ln
bmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAxMiArKysrKystLS0tLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8ICAyICstCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kc2kuaCAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgIDQgKystLQogNCBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNl
cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAz
ZDg3NDFlZmY3ZDMuLjExYWU1YTVhMGEyZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0y
ODYsNyArMjg2LDcgQEAgc3RydWN0IGk5MTVfaG90cGx1ZyB7CiAJbGlzdF9mb3JfZWFjaF9lbnRy
eShpbnRlbF9wbGFuZSwJCQkJXAogCQkJICAgICYoZGV2KS0+bW9kZV9jb25maWcucGxhbmVfbGlz
dCwJCVwKIAkJCSAgICBiYXNlLmhlYWQpCQkJCQlcCi0JCWlmICgoaW50ZWxfcGxhbmUpLT5waXBl
ID09IChpbnRlbF9jcnRjKS0+cGlwZSkKKwkJZm9yX2VhY2hfaWYgKChpbnRlbF9wbGFuZSktPnBp
cGUgPT0gKGludGVsX2NydGMpLT5waXBlKQogCiAjZGVmaW5lIGZvcl9lYWNoX2ludGVsX2NydGMo
ZGV2LCBpbnRlbF9jcnRjKSBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRlbF9jcnRjLCAmZGV2
LT5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGJhc2UuaGVhZCkKQEAgLTMwMywxNSArMzAzLDE1IEBA
IHN0cnVjdCBpOTE1X2hvdHBsdWcgewogCiAjZGVmaW5lIGZvcl9lYWNoX2VuY29kZXJfb25fY3J0
YyhkZXYsIF9fY3J0YywgaW50ZWxfZW5jb2RlcikgXAogCWxpc3RfZm9yX2VhY2hfZW50cnkoKGlu
dGVsX2VuY29kZXIpLCAmKGRldiktPm1vZGVfY29uZmlnLmVuY29kZXJfbGlzdCwgYmFzZS5oZWFk
KSBcCi0JCWlmICgoaW50ZWxfZW5jb2RlciktPmJhc2UuY3J0YyA9PSAoX19jcnRjKSkKKwkJZm9y
X2VhY2hfaWYgKChpbnRlbF9lbmNvZGVyKS0+YmFzZS5jcnRjID09IChfX2NydGMpKQogCiAjZGVm
aW5lIGZvcl9lYWNoX2Nvbm5lY3Rvcl9vbl9lbmNvZGVyKGRldiwgX19lbmNvZGVyLCBpbnRlbF9j
b25uZWN0b3IpIFwKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KChpbnRlbF9jb25uZWN0b3IpLCAmKGRl
diktPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0LCBiYXNlLmhlYWQpIFwKLQkJaWYgKChpbnRl
bF9jb25uZWN0b3IpLT5iYXNlLmVuY29kZXIgPT0gKF9fZW5jb2RlcikpCisJCWZvcl9lYWNoX2lm
ICgoaW50ZWxfY29ubmVjdG9yKS0+YmFzZS5lbmNvZGVyID09IChfX2VuY29kZXIpKQogCiAjZGVm
aW5lIGZvcl9lYWNoX3Bvd2VyX2RvbWFpbihkb21haW4sIG1hc2spCQkJCVwKIAlmb3IgKChkb21h
aW4pID0gMDsgKGRvbWFpbikgPCBQT1dFUl9ET01BSU5fTlVNOyAoZG9tYWluKSsrKQlcCi0JCWlm
ICgoMSA8PCAoZG9tYWluKSkgJiAobWFzaykpCisJCWZvcl9lYWNoX2lmICgoMSA8PCAoZG9tYWlu
KSkgJiAobWFzaykpCiAKIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlOwogc3RydWN0IGk5MTVfbW1f
c3RydWN0OwpAQCAtNzMwLDcgKzczMCw3IEBAIHN0cnVjdCBpbnRlbF91bmNvcmUgewogCWZvciAo
KGlfXykgPSAwLCAoZG9tYWluX18pID0gJihkZXZfcHJpdl9fKS0+dW5jb3JlLmZ3X2RvbWFpblsw
XTsgXAogCSAgICAgKGlfXykgPCBGV19ET01BSU5fSURfQ09VTlQ7IFwKIAkgICAgIChpX18pKyss
IChkb21haW5fXykgPSAmKGRldl9wcml2X18pLT51bmNvcmUuZndfZG9tYWluW2lfX10pIFwKLQkJ
aWYgKCgobWFza19fKSAmIChkZXZfcHJpdl9fKS0+dW5jb3JlLmZ3X2RvbWFpbnMpICYgKDEgPDwg
KGlfXykpKQorCQlmb3JfZWFjaF9pZiAoKChtYXNrX18pICYgKGRldl9wcml2X18pLT51bmNvcmUu
ZndfZG9tYWlucykgJiAoMSA8PCAoaV9fKSkpCiAKICNkZWZpbmUgZm9yX2VhY2hfZndfZG9tYWlu
KGRvbWFpbl9fLCBkZXZfcHJpdl9fLCBpX18pIFwKIAlmb3JfZWFjaF9md19kb21haW5fbWFzayhk
b21haW5fXywgRk9SQ0VXQUtFX0FMTCwgZGV2X3ByaXZfXywgaV9fKQpAQCAtMTk2OSw3ICsxOTY5
LDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZ3VjX3RvX2k5MTUo
c3RydWN0IGludGVsX2d1YyAqZ3VjKQogLyogSXRlcmF0ZSBvdmVyIGluaXRpYWxpc2VkIHJpbmdz
ICovCiAjZGVmaW5lIGZvcl9lYWNoX3JpbmcocmluZ19fLCBkZXZfcHJpdl9fLCBpX18pIFwKIAlm
b3IgKChpX18pID0gMDsgKGlfXykgPCBJOTE1X05VTV9SSU5HUzsgKGlfXykrKykgXAotCQlpZiAo
KChyaW5nX18pID0gJihkZXZfcHJpdl9fKS0+cmluZ1soaV9fKV0pLCBpbnRlbF9yaW5nX2luaXRp
YWxpemVkKChyaW5nX18pKSkKKwkJZm9yX2VhY2hfaWYgKCgoKHJpbmdfXykgPSAmKGRldl9wcml2
X18pLT5yaW5nWyhpX18pXSksIGludGVsX3JpbmdfaW5pdGlhbGl6ZWQoKHJpbmdfXykpKSkKIAog
ZW51bSBoZG1pX2ZvcmNlX2F1ZGlvIHsKIAlIRE1JX0FVRElPX09GRl9EVkkgPSAtMiwJLyogbm8g
YXV4IGRhdGEgZm9yIEhETUktRFZJIGNvbnZlcnRlciAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCmluZGV4IDc1ZjAzZTViZWU1MS4uNGIyMWQ1ZTEzN2RjIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjQxNyw3ICsxMjQxNyw3IEBAIHN0YXRpYyBib29s
IGludGVsX2Z1enp5X2Nsb2NrX2NoZWNrKGludCBjbG9jazEsIGludCBjbG9jazIpCiAJbGlzdF9m
b3JfZWFjaF9lbnRyeSgoaW50ZWxfY3J0YyksIFwKIAkJCSAgICAmKGRldiktPm1vZGVfY29uZmln
LmNydGNfbGlzdCwgXAogCQkJICAgIGJhc2UuaGVhZCkgXAotCQlpZiAobWFzayAmICgxIDw8KGlu
dGVsX2NydGMpLT5waXBlKSkKKwkJZm9yX2VhY2hfaWYgKG1hc2sgJiAoMSA8PChpbnRlbF9jcnRj
KS0+cGlwZSkpCiAKIHN0YXRpYyBib29sCiBpbnRlbF9jb21wYXJlX21fbih1bnNpZ25lZCBpbnQg
bSwgdW5zaWduZWQgaW50IG4sCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kc2kuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5oCmluZGV4IGU2Y2IyNTIz
OTk0MS4uMDI1NTFmZjIyOGMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kc2kuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuaApAQCAtMTE3LDcg
KzExNyw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX2RzaV9ob3N0ICp0b19pbnRlbF9k
c2lfaG9zdChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaCkKIAogI2RlZmluZSBmb3JfZWFjaF9kc2lf
cG9ydChfX3BvcnQsIF9fcG9ydHNfbWFzaykgXAogCWZvciAoKF9fcG9ydCkgPSBQT1JUX0E7IChf
X3BvcnQpIDwgSTkxNV9NQVhfUE9SVFM7IChfX3BvcnQpKyspCVwKLQkJaWYgKChfX3BvcnRzX21h
c2spICYgKDEgPDwgKF9fcG9ydCkpKQorCQlmb3JfZWFjaF9pZiAoKF9fcG9ydHNfbWFzaykgJiAo
MSA8PCAoX19wb3J0KSkpCiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX2RzaSAqZW5jX3Rv
X2ludGVsX2RzaShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiB7CmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggM2ZhNDNhZjk0OTQ2Li40Njk5MjdlZGY0NTkg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTU0LDEzICs1NCwx
MyBAQAogCSAgICAgaSA8IChwb3dlcl9kb21haW5zKS0+cG93ZXJfd2VsbF9jb3VudCAmJgkJCVwK
IAkJICgocG93ZXJfd2VsbCkgPSAmKHBvd2VyX2RvbWFpbnMpLT5wb3dlcl93ZWxsc1tpXSk7CVwK
IAkgICAgIGkrKykJCQkJCQkJXAotCQlpZiAoKHBvd2VyX3dlbGwpLT5kb21haW5zICYgKGRvbWFp
bl9tYXNrKSkKKwkJZm9yX2VhY2hfaWYgKChwb3dlcl93ZWxsKS0+ZG9tYWlucyAmIChkb21haW5f
bWFzaykpCiAKICNkZWZpbmUgZm9yX2VhY2hfcG93ZXJfd2VsbF9yZXYoaSwgcG93ZXJfd2VsbCwg
ZG9tYWluX21hc2ssIHBvd2VyX2RvbWFpbnMpIFwKIAlmb3IgKGkgPSAocG93ZXJfZG9tYWlucykt
PnBvd2VyX3dlbGxfY291bnQgLSAxOwkJCSBcCiAJICAgICBpID49IDAgJiYgKChwb3dlcl93ZWxs
KSA9ICYocG93ZXJfZG9tYWlucyktPnBvd2VyX3dlbGxzW2ldKTtcCiAJICAgICBpLS0pCQkJCQkJ
CSBcCi0JCWlmICgocG93ZXJfd2VsbCktPmRvbWFpbnMgJiAoZG9tYWluX21hc2spKQorCQlmb3Jf
ZWFjaF9pZiAoKHBvd2VyX3dlbGwpLT5kb21haW5zICYgKGRvbWFpbl9tYXNrKSkKIAogYm9vbCBp
bnRlbF9kaXNwbGF5X3Bvd2VyX3dlbGxfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYsCiAJCQkJICAgIGludCBwb3dlcl93ZWxsX2lkKTsKLS0gCjIuMS40CgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy
ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=