From: Behan Webster Subject: [PATCH] Remove nested functions from the Thinkpad ACPI Date: Thu, 14 Feb 2013 09:44:30 -0500 Message-ID: <1360853070-11301-1-git-send-email-behanw@converseincode.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ibm-acpi-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: ibm-acpi-N3TV7GIv+o9fyO9Q7EP/yw@public.gmane.org Cc: matthew.garrett-05XSO3Yj/JvQT0dZR+AlfA@public.gmane.org, platform-driver-x86-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Behan Webster , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ibm-acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: platform-driver-x86.vger.kernel.org UmVtb3ZlIHRoZSB1c2Ugb2YgbmVzdGVkIGZ1bmN0aW9ucyBmcm9tIHRoZSBUaGlua3BhZCBBQ1BJ IGRyaXZlci4KClNpZ25lZC1vZmYtYnk6IEJlaGFuIFdlYnN0ZXIgPGJlaGFud0Bjb252ZXJzZWlu Y29kZS5jb20+ClNpZ25lZC1vZmYtYnk6IEphbi1TaW1vbiBNw7ZsbGVyIDxkbDlwZiBhdCBnbXgu ZGU+Ci0tLQogZHJpdmVycy9wbGF0Zm9ybS94ODYvdGhpbmtwYWRfYWNwaS5jIHwgICA4NiArKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0 aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wbGF0Zm9ybS94 ODYvdGhpbmtwYWRfYWNwaS5jIGIvZHJpdmVycy9wbGF0Zm9ybS94ODYvdGhpbmtwYWRfYWNwaS5j CmluZGV4IGY5NDZjYTcuLmI4NWZlYzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGxhdGZvcm0veDg2 L3RoaW5rcGFkX2FjcGkuYworKysgYi9kcml2ZXJzL3BsYXRmb3JtL3g4Ni90aGlua3BhZF9hY3Bp LmMKQEAgLTIzMjgsNTMgKzIzMjgsNTUgQEAgc3RhdGljIHZvaWQgaG90a2V5X3JlYWRfbnZyYW0o c3RydWN0IHRwX252cmFtX3N0YXRlICpuLCBjb25zdCB1MzIgbSkKIAl9CiB9CiAKLXN0YXRpYyB2 b2lkIGhvdGtleV9jb21wYXJlX2FuZF9pc3N1ZV9ldmVudChzdHJ1Y3QgdHBfbnZyYW1fc3RhdGUg Km9sZG4sCi0JCQkJCSAgIHN0cnVjdCB0cF9udnJhbV9zdGF0ZSAqbmV3biwKLQkJCQkJICAgY29u c3QgdTMyIGV2ZW50X21hc2spCi17Ci0KICNkZWZpbmUgVFBBQ1BJX0NPTVBBUkVfS0VZKF9fc2Nh bmNvZGUsIF9fbWVtYmVyKSBcCi0JZG8geyBcCi0JCWlmICgoZXZlbnRfbWFzayAmICgxIDw8IF9f c2NhbmNvZGUpKSAmJiBcCi0JCSAgICBvbGRuLT5fX21lbWJlciAhPSBuZXduLT5fX21lbWJlcikg XAotCQkJdHBhY3BpX2hvdGtleV9zZW5kX2tleShfX3NjYW5jb2RlKTsgXAotCX0gd2hpbGUgKDAp CitkbyB7IFwKKwlpZiAoKGV2ZW50X21hc2sgJiAoMSA8PCBfX3NjYW5jb2RlKSkgJiYgXAorCSAg ICBvbGRuLT5fX21lbWJlciAhPSBuZXduLT5fX21lbWJlcikgXAorCQl0cGFjcGlfaG90a2V5X3Nl bmRfa2V5KF9fc2NhbmNvZGUpOyBcCit9IHdoaWxlICgwKQogCiAjZGVmaW5lIFRQQUNQSV9NQVlf U0VORF9LRVkoX19zY2FuY29kZSkgXAotCWRvIHsgXAotCQlpZiAoZXZlbnRfbWFzayAmICgxIDw8 IF9fc2NhbmNvZGUpKSBcCi0JCQl0cGFjcGlfaG90a2V5X3NlbmRfa2V5KF9fc2NhbmNvZGUpOyBc Ci0JfSB3aGlsZSAoMCkKK2RvIHsgXAorCWlmIChldmVudF9tYXNrICYgKDEgPDwgX19zY2FuY29k ZSkpIFwKKwkJdHBhY3BpX2hvdGtleV9zZW5kX2tleShfX3NjYW5jb2RlKTsgXAorfSB3aGlsZSAo MCkKIAotCXZvaWQgaXNzdWVfdm9sY2hhbmdlKGNvbnN0IHVuc2lnbmVkIGludCBvbGR2b2wsCi0J CQkgICAgIGNvbnN0IHVuc2lnbmVkIGludCBuZXd2b2wpCi0JewotCQl1bnNpZ25lZCBpbnQgaSA9 IG9sZHZvbDsKK3N0YXRpYyB2b2lkIGlzc3VlX3ZvbGNoYW5nZShjb25zdCB1bnNpZ25lZCBpbnQg b2xkdm9sLAorCQkJICAgIGNvbnN0IHVuc2lnbmVkIGludCBuZXd2b2wsCisJCQkgICAgY29uc3Qg dTMyIGV2ZW50X21hc2spCit7CisJdW5zaWduZWQgaW50IGkgPSBvbGR2b2w7CiAKLQkJd2hpbGUg KGkgPiBuZXd2b2wpIHsKLQkJCVRQQUNQSV9NQVlfU0VORF9LRVkoVFBfQUNQSV9IT1RLRVlTQ0FO X1ZPTFVNRURPV04pOwotCQkJaS0tOwotCQl9Ci0JCXdoaWxlIChpIDwgbmV3dm9sKSB7Ci0JCQlU UEFDUElfTUFZX1NFTkRfS0VZKFRQX0FDUElfSE9US0VZU0NBTl9WT0xVTUVVUCk7Ci0JCQlpKys7 Ci0JCX0KKwl3aGlsZSAoaSA+IG5ld3ZvbCkgeworCQlUUEFDUElfTUFZX1NFTkRfS0VZKFRQX0FD UElfSE9US0VZU0NBTl9WT0xVTUVET1dOKTsKKwkJaS0tOworCX0KKwl3aGlsZSAoaSA8IG5ld3Zv bCkgeworCQlUUEFDUElfTUFZX1NFTkRfS0VZKFRQX0FDUElfSE9US0VZU0NBTl9WT0xVTUVVUCk7 CisJCWkrKzsKIAl9Cit9CiAKLQl2b2lkIGlzc3VlX2JyaWdodG5lc3NjaGFuZ2UoY29uc3QgdW5z aWduZWQgaW50IG9sZGJydCwKLQkJCQkgICAgY29uc3QgdW5zaWduZWQgaW50IG5ld2JydCkKLQl7 Ci0JCXVuc2lnbmVkIGludCBpID0gb2xkYnJ0Oworc3RhdGljIHZvaWQgaXNzdWVfYnJpZ2h0bmVz c2NoYW5nZShjb25zdCB1bnNpZ25lZCBpbnQgb2xkYnJ0LAorCQkJCSAgIGNvbnN0IHVuc2lnbmVk IGludCBuZXdicnQsCisJCQkJICAgY29uc3QgdTMyIGV2ZW50X21hc2spCit7CisJdW5zaWduZWQg aW50IGkgPSBvbGRicnQ7CiAKLQkJd2hpbGUgKGkgPiBuZXdicnQpIHsKLQkJCVRQQUNQSV9NQVlf U0VORF9LRVkoVFBfQUNQSV9IT1RLRVlTQ0FOX0ZORU5EKTsKLQkJCWktLTsKLQkJfQotCQl3aGls ZSAoaSA8IG5ld2JydCkgewotCQkJVFBBQ1BJX01BWV9TRU5EX0tFWShUUF9BQ1BJX0hPVEtFWVND QU5fRk5IT01FKTsKLQkJCWkrKzsKLQkJfQorCXdoaWxlIChpID4gbmV3YnJ0KSB7CisJCVRQQUNQ SV9NQVlfU0VORF9LRVkoVFBfQUNQSV9IT1RLRVlTQ0FOX0ZORU5EKTsKKwkJaS0tOwogCX0KKwl3 aGlsZSAoaSA8IG5ld2JydCkgeworCQlUUEFDUElfTUFZX1NFTkRfS0VZKFRQX0FDUElfSE9US0VZ U0NBTl9GTkhPTUUpOworCQlpKys7CisJfQorfQorCitzdGF0aWMgdm9pZCBob3RrZXlfY29tcGFy ZV9hbmRfaXNzdWVfZXZlbnQoc3RydWN0IHRwX252cmFtX3N0YXRlICpvbGRuLAorCQkJCQkgICBz dHJ1Y3QgdHBfbnZyYW1fc3RhdGUgKm5ld24sCisJCQkJCSAgIGNvbnN0IHUzMiBldmVudF9tYXNr KQorewogCiAJVFBBQ1BJX0NPTVBBUkVfS0VZKFRQX0FDUElfSE9US0VZU0NBTl9USElOS1BBRCwg dGhpbmtwYWRfdG9nZ2xlKTsKIAlUUEFDUElfQ09NUEFSRV9LRVkoVFBfQUNQSV9IT1RLRVlTQ0FO X0ZOU1BBQ0UsIHpvb21fdG9nZ2xlKTsKQEAgLTI0MDksNyArMjQxMSw4IEBAIHN0YXRpYyB2b2lk IGhvdGtleV9jb21wYXJlX2FuZF9pc3N1ZV9ldmVudChzdHJ1Y3QgdHBfbnZyYW1fc3RhdGUgKm9s ZG4sCiAJCSAgICBvbGRuLT52b2x1bWVfbGV2ZWwgIT0gbmV3bi0+dm9sdW1lX2xldmVsKSB7CiAJ CQkvKiByZWNlbnRseSBtdXRlZCwgb3IgcmVwZWF0ZWQgbXV0ZSBrZXlwcmVzcywgb3IKIAkJCSAq IG11bHRpcGxlIHByZXNzZXMgZW5kaW5nIGluIG11dGUgKi8KLQkJCWlzc3VlX3ZvbGNoYW5nZShv bGRuLT52b2x1bWVfbGV2ZWwsIG5ld24tPnZvbHVtZV9sZXZlbCk7CisJCQlpc3N1ZV92b2xjaGFu Z2Uob2xkbi0+dm9sdW1lX2xldmVsLCBuZXduLT52b2x1bWVfbGV2ZWwsCisJCQkJZXZlbnRfbWFz ayk7CiAJCQlUUEFDUElfTUFZX1NFTkRfS0VZKFRQX0FDUElfSE9US0VZU0NBTl9NVVRFKTsKIAkJ fQogCX0gZWxzZSB7CkBAIC0yNDE5LDcgKzI0MjIsOCBAQCBzdGF0aWMgdm9pZCBob3RrZXlfY29t cGFyZV9hbmRfaXNzdWVfZXZlbnQoc3RydWN0IHRwX252cmFtX3N0YXRlICpvbGRuLAogCQkJVFBB Q1BJX01BWV9TRU5EX0tFWShUUF9BQ1BJX0hPVEtFWVNDQU5fVk9MVU1FVVApOwogCQl9CiAJCWlm IChvbGRuLT52b2x1bWVfbGV2ZWwgIT0gbmV3bi0+dm9sdW1lX2xldmVsKSB7Ci0JCQlpc3N1ZV92 b2xjaGFuZ2Uob2xkbi0+dm9sdW1lX2xldmVsLCBuZXduLT52b2x1bWVfbGV2ZWwpOworCQkJaXNz dWVfdm9sY2hhbmdlKG9sZG4tPnZvbHVtZV9sZXZlbCwgbmV3bi0+dm9sdW1lX2xldmVsLAorCQkJ CWV2ZW50X21hc2spOwogCQl9IGVsc2UgaWYgKG9sZG4tPnZvbHVtZV90b2dnbGUgIT0gbmV3bi0+ dm9sdW1lX3RvZ2dsZSkgewogCQkJLyogcmVwZWF0ZWQgdm9sIHVwL2Rvd24ga2V5cHJlc3MgYXQg ZW5kIG9mIHNjYWxlID8gKi8KIAkJCWlmIChuZXduLT52b2x1bWVfbGV2ZWwgPT0gMCkKQEAgLTI0 MzIsNyArMjQzNiw3IEBAIHN0YXRpYyB2b2lkIGhvdGtleV9jb21wYXJlX2FuZF9pc3N1ZV9ldmVu dChzdHJ1Y3QgdHBfbnZyYW1fc3RhdGUgKm9sZG4sCiAJLyogaGFuZGxlIGJyaWdodG5lc3MgKi8K IAlpZiAob2xkbi0+YnJpZ2h0bmVzc19sZXZlbCAhPSBuZXduLT5icmlnaHRuZXNzX2xldmVsKSB7 CiAJCWlzc3VlX2JyaWdodG5lc3NjaGFuZ2Uob2xkbi0+YnJpZ2h0bmVzc19sZXZlbCwKLQkJCQkg ICAgICAgbmV3bi0+YnJpZ2h0bmVzc19sZXZlbCk7CisJCQkJICAgICAgIG5ld24tPmJyaWdodG5l c3NfbGV2ZWwsIGV2ZW50X21hc2spOwogCX0gZWxzZSBpZiAob2xkbi0+YnJpZ2h0bmVzc190b2dn bGUgIT0gbmV3bi0+YnJpZ2h0bmVzc190b2dnbGUpIHsKIAkJLyogcmVwZWF0ZWQga2V5IHByZXNz ZXMgdGhhdCBkaWRuJ3QgY2hhbmdlIHN0YXRlICovCiAJCWlmIChuZXduLT5icmlnaHRuZXNzX2xl dmVsID09IDApCi0tIAoxLjcuMTAuNAoKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpFdmVyeW9uZSBo YXRlcyBzbG93IHdlYnNpdGVzLiBTbyBkbyB3ZS4KTWFrZSB5b3VyIHdlYiBhcHBzIGZhc3RlciB3 aXRoIEFwcER5bmFtaWNzCkRvd25sb2FkIEFwcER5bmFtaWNzIExpdGUgZm9yIGZyZWUgdG9kYXk6 Cmh0dHA6Ly9wLnNmLm5ldC9zZnUvYXBwZHluX2QyZF9mZWIKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KaWJtLWFjcGktZGV2ZWwgbWFpbGluZyBsaXN0Cmli bS1hY3BpLWRldmVsQGxpc3RzLnNvdXJjZWZvcmdlLm5ldApodHRwczovL2xpc3RzLnNvdXJjZWZv cmdlLm5ldC9saXN0cy9saXN0aW5mby9pYm0tYWNwaS1kZXZlbAo=