From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH 04/10] mtd: mxc_nand: split some functions to get rid of more nfc_is_vX() Date: Mon, 23 Apr 2012 11:23:36 +0200 Message-ID: <1335173022-22371-4-git-send-email-u.kleine-koenig@pengutronix.de> References: <20120423092240.GA18013@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20120423092240.GA18013@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: linux-mtd@lists.infradead.org Cc: devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de List-Id: devicetree@vger.kernel.org U2lnbmVkLW9mZi1ieTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRy b25peC5kZT4KLS0tCiBkcml2ZXJzL210ZC9uYW5kL214Y19uYW5kLmMgfCAgMTA5ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4MCBp bnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9u YW5kL214Y19uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL214Y19uYW5kLmMKaW5kZXggMTY3MmU0 Yi4uYzljZGVjMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9teGNfbmFuZC5jCisrKyBi L2RyaXZlcnMvbXRkL25hbmQvbXhjX25hbmQuYwpAQCAtMTUxLDYgKzE1MSw3IEBAIHN0cnVjdCBt eGNfbmFuZF9kZXZ0eXBlX2RhdGEgewogCXVpbnQxNl90ICgqZ2V0X2Rldl9zdGF0dXMpKHN0cnVj dCBteGNfbmFuZF9ob3N0ICopOwogCWludCAoKmNoZWNrX2ludCkoc3RydWN0IG14Y19uYW5kX2hv c3QgKik7CiAJdm9pZCAoKmlycV9jb250cm9sKShzdHJ1Y3QgbXhjX25hbmRfaG9zdCAqLCBpbnQp OworCXUzMiAoKmdldF9lY2Nfc3RhdHVzKShzdHJ1Y3QgbXhjX25hbmRfaG9zdCAqKTsKIH07CiAK IHN0cnVjdCBteGNfbmFuZF9ob3N0IHsKQEAgLTMyNSw2ICszMjYsMjEgQEAgc3RhdGljIHZvaWQg aXJxX2NvbnRyb2woc3RydWN0IG14Y19uYW5kX2hvc3QgKmhvc3QsIGludCBhY3RpdmF0ZSkKIAl9 CiB9CiAKK3N0YXRpYyB1MzIgZ2V0X2VjY19zdGF0dXNfdjEoc3RydWN0IG14Y19uYW5kX2hvc3Qg Kmhvc3QpCit7CisJcmV0dXJuIHJlYWR3KE5GQ19WMV9WMl9FQ0NfU1RBVFVTX1JFU1VMVCk7Cit9 CisKK3N0YXRpYyB1MzIgZ2V0X2VjY19zdGF0dXNfdjIoc3RydWN0IG14Y19uYW5kX2hvc3QgKmhv c3QpCit7CisJcmV0dXJuIHJlYWRsKE5GQ19WMV9WMl9FQ0NfU1RBVFVTX1JFU1VMVCk7Cit9CisK K3N0YXRpYyB1MzIgZ2V0X2VjY19zdGF0dXNfdjMoc3RydWN0IG14Y19uYW5kX2hvc3QgKmhvc3Qp Cit7CisJcmV0dXJuIHJlYWRsKE5GQ19WM19FQ0NfU1RBVFVTX1JFU1VMVCk7Cit9CisKIHN0YXRp YyBpcnFyZXR1cm5fdCBteGNfbmZjX2lycShpbnQgaXJxLCB2b2lkICpkZXZfaWQpCiB7CiAJc3Ry dWN0IG14Y19uYW5kX2hvc3QgKmhvc3QgPSBkZXZfaWQ7CkBAIC00NDUsMTMgKzQ2MSwyNyBAQCBz dGF0aWMgdm9pZCBzZW5kX3BhZ2VfdjMoc3RydWN0IG10ZF9pbmZvICptdGQsIHVuc2lnbmVkIGlu dCBvcHMpCiAJd2FpdF9vcF9kb25lKGhvc3QsIGZhbHNlKTsKIH0KIAotc3RhdGljIHZvaWQgc2Vu ZF9wYWdlX3YxX3YyKHN0cnVjdCBtdGRfaW5mbyAqbXRkLCB1bnNpZ25lZCBpbnQgb3BzKQorc3Rh dGljIHZvaWQgc2VuZF9wYWdlX3YyKHN0cnVjdCBtdGRfaW5mbyAqbXRkLCB1bnNpZ25lZCBpbnQg b3BzKQoreworCXN0cnVjdCBuYW5kX2NoaXAgKm5hbmRfY2hpcCA9IG10ZC0+cHJpdjsKKwlzdHJ1 Y3QgbXhjX25hbmRfaG9zdCAqaG9zdCA9IG5hbmRfY2hpcC0+cHJpdjsKKworCS8qIE5BTkRGQyBi dWZmZXIgMCBpcyB1c2VkIGZvciBwYWdlIHJlYWQvd3JpdGUgKi8KKwl3cml0ZXcoaG9zdC0+YWN0 aXZlX2NzIDw8IDQsIE5GQ19WMV9WMl9CVUZfQUREUik7CisKKwl3cml0ZXcob3BzLCBORkNfVjFf VjJfQ09ORklHMik7CisKKwkvKiBXYWl0IGZvciBvcGVyYXRpb24gdG8gY29tcGxldGUgKi8KKwl3 YWl0X29wX2RvbmUoaG9zdCwgdHJ1ZSk7Cit9CisKK3N0YXRpYyB2b2lkIHNlbmRfcGFnZV92MShz dHJ1Y3QgbXRkX2luZm8gKm10ZCwgdW5zaWduZWQgaW50IG9wcykKIHsKIAlzdHJ1Y3QgbmFuZF9j aGlwICpuYW5kX2NoaXAgPSBtdGQtPnByaXY7CiAJc3RydWN0IG14Y19uYW5kX2hvc3QgKmhvc3Qg PSBuYW5kX2NoaXAtPnByaXY7CiAJaW50IGJ1ZnMsIGk7CiAKLQlpZiAobmZjX2lzX3YxKCkgJiYg bXRkLT53cml0ZXNpemUgPiA1MTIpCisJaWYgKG10ZC0+d3JpdGVzaXplID4gNTEyKQogCQlidWZz ID0gNDsKIAllbHNlCiAJCWJ1ZnMgPSAxOwpAQCAtNTY3LDcgKzU5Nyw3IEBAIHN0YXRpYyBpbnQg bXhjX25hbmRfY29ycmVjdF9kYXRhX3YxKHN0cnVjdCBtdGRfaW5mbyAqbXRkLCB1X2NoYXIgKmRh dCwKIAkgKiBhZGRpdGlvbmFsIGNvcnJlY3Rpb24uICAyLUJpdCBlcnJvcnMgY2Fubm90IGJlIGNv cnJlY3RlZCBieQogCSAqIEhXIEVDQywgc28gd2UgbmVlZCB0byByZXR1cm4gZmFpbHVyZQogCSAq LwotCXVpbnQxNl90IGVjY19zdGF0dXMgPSByZWFkdyhORkNfVjFfVjJfRUNDX1NUQVRVU19SRVNV TFQpOworCXVpbnQxNl90IGVjY19zdGF0dXMgPSBnZXRfZWNjX3N0YXR1c192MShob3N0KTsKIAog CWlmICgoKGVjY19zdGF0dXMgJiAweDMpID09IDIpIHx8ICgoZWNjX3N0YXR1cyA+PiAyKSA9PSAy KSkgewogCQlwcl9kZWJ1ZygiTVhDX05BTkQ6IEhXRUNDIHVuY29ycmVjdGFibGUgMi1iaXQgRUND IGVycm9yXG4iKTsKQEAgLTU5MiwxMCArNjIyLDcgQEAgc3RhdGljIGludCBteGNfbmFuZF9jb3Jy ZWN0X2RhdGFfdjJfdjMoc3RydWN0IG10ZF9pbmZvICptdGQsIHVfY2hhciAqZGF0LAogCiAJbm9f c3VicGFnZXMgPSBtdGQtPndyaXRlc2l6ZSA+PiA5OwogCi0JaWYgKG5mY19pc192MjEoKSkKLQkJ ZWNjX3N0YXQgPSByZWFkbChORkNfVjFfVjJfRUNDX1NUQVRVU19SRVNVTFQpOwotCWVsc2UKLQkJ ZWNjX3N0YXQgPSByZWFkbChORkNfVjNfRUNDX1NUQVRVU19SRVNVTFQpOworCWVjY19zdGF0ID0g aG9zdC0+ZGV2dHlwZV9kYXRhLT5nZXRfZWNjX3N0YXR1cyhob3N0KTsKIAogCWRvIHsKIAkJZXJy ID0gZWNjX3N0YXQgJiBlY2NfYml0X21hc2s7CkBAIC04MjIsNyArODQ5LDcgQEAgc3RhdGljIGlu dCBnZXRfZWNjc2l6ZShzdHJ1Y3QgbXRkX2luZm8gKm10ZCkKIAkJcmV0dXJuIDg7CiB9CiAKLXN0 YXRpYyB2b2lkIHByZXNldF92MV92MihzdHJ1Y3QgbXRkX2luZm8gKm10ZCkKK3N0YXRpYyB2b2lk IHByZXNldF92MShzdHJ1Y3QgbXRkX2luZm8gKm10ZCkKIHsKIAlzdHJ1Y3QgbmFuZF9jaGlwICpu YW5kX2NoaXAgPSBtdGQtPnByaXY7CiAJc3RydWN0IG14Y19uYW5kX2hvc3QgKmhvc3QgPSBuYW5k X2NoaXAtPnByaXY7CkBAIC04MzEsMTMgKzg1OCw0MCBAQCBzdGF0aWMgdm9pZCBwcmVzZXRfdjFf djIoc3RydWN0IG10ZF9pbmZvICptdGQpCiAJaWYgKG5hbmRfY2hpcC0+ZWNjLm1vZGUgPT0gTkFO RF9FQ0NfSFcpCiAJCWNvbmZpZzEgfD0gTkZDX1YxX1YyX0NPTkZJRzFfRUNDX0VOOwogCi0JaWYg KG5mY19pc192MjEoKSkKLQkJY29uZmlnMSB8PSBORkNfVjJfQ09ORklHMV9GUF9JTlQ7CisJaWYg KCFob3N0LT5pcnFwZW5kaW5nX3F1aXJrKQorCQljb25maWcxIHw9IE5GQ19WMV9WMl9DT05GSUcx X0lOVF9NU0s7CisKKwlob3N0LT5lY2NzaXplID0gMTsKKworCXdyaXRldyhjb25maWcxLCBORkNf VjFfVjJfQ09ORklHMSk7CisJLyogcHJlc2V0IG9wZXJhdGlvbiAqLworCisJLyogVW5sb2NrIHRo ZSBpbnRlcm5hbCBSQU0gQnVmZmVyICovCisJd3JpdGV3KDB4MiwgTkZDX1YxX1YyX0NPTkZJRyk7 CisKKwkvKiBCbG9ja3MgdG8gYmUgdW5sb2NrZWQgKi8KKwl3cml0ZXcoMHgwLCBORkNfVjFfVU5M T0NLU1RBUlRfQkxLQUREUik7CisJd3JpdGV3KDB4ZmZmZiwgTkZDX1YxX1VOTE9DS0VORF9CTEtB RERSKTsKKworCS8qIFVubG9jayBCbG9jayBDb21tYW5kIGZvciBnaXZlbiBhZGRyZXNzIHJhbmdl ICovCisJd3JpdGV3KDB4NCwgTkZDX1YxX1YyX1dSUFJPVCk7Cit9CisKK3N0YXRpYyB2b2lkIHBy ZXNldF92MihzdHJ1Y3QgbXRkX2luZm8gKm10ZCkKK3sKKwlzdHJ1Y3QgbmFuZF9jaGlwICpuYW5k X2NoaXAgPSBtdGQtPnByaXY7CisJc3RydWN0IG14Y19uYW5kX2hvc3QgKmhvc3QgPSBuYW5kX2No aXAtPnByaXY7CisJdWludDE2X3QgY29uZmlnMSA9IDA7CisKKwlpZiAobmFuZF9jaGlwLT5lY2Mu bW9kZSA9PSBOQU5EX0VDQ19IVykKKwkJY29uZmlnMSB8PSBORkNfVjFfVjJfQ09ORklHMV9FQ0Nf RU47CisKKwljb25maWcxIHw9IE5GQ19WMl9DT05GSUcxX0ZQX0lOVDsKIAogCWlmICghaG9zdC0+ aXJxcGVuZGluZ19xdWlyaykKIAkJY29uZmlnMSB8PSBORkNfVjFfVjJfQ09ORklHMV9JTlRfTVNL OwogCi0JaWYgKG5mY19pc192MjEoKSAmJiBtdGQtPndyaXRlc2l6ZSkgeworCWlmIChtdGQtPndy aXRlc2l6ZSkgewogCQl1aW50MTZfdCBwYWdlc19wZXJfYmxvY2sgPSBtdGQtPmVyYXNlc2l6ZSAv IG10ZC0+d3JpdGVzaXplOwogCiAJCWhvc3QtPmVjY3NpemUgPSBnZXRfZWNjc2l6ZShtdGQpOwpA QCAtODU2LDIwICs5MTAsMTQgQEAgc3RhdGljIHZvaWQgcHJlc2V0X3YxX3YyKHN0cnVjdCBtdGRf aW5mbyAqbXRkKQogCXdyaXRldygweDIsIE5GQ19WMV9WMl9DT05GSUcpOwogCiAJLyogQmxvY2tz IHRvIGJlIHVubG9ja2VkICovCi0JaWYgKG5mY19pc192MjEoKSkgewotCQl3cml0ZXcoMHgwLCBO RkNfVjIxX1VOTE9DS1NUQVJUX0JMS0FERFIwKTsKLQkJd3JpdGV3KDB4MCwgTkZDX1YyMV9VTkxP Q0tTVEFSVF9CTEtBRERSMSk7Ci0JCXdyaXRldygweDAsIE5GQ19WMjFfVU5MT0NLU1RBUlRfQkxL QUREUjIpOwotCQl3cml0ZXcoMHgwLCBORkNfVjIxX1VOTE9DS1NUQVJUX0JMS0FERFIzKTsKLQkJ d3JpdGV3KDB4ZmZmZiwgTkZDX1YyMV9VTkxPQ0tFTkRfQkxLQUREUjApOwotCQl3cml0ZXcoMHhm ZmZmLCBORkNfVjIxX1VOTE9DS0VORF9CTEtBRERSMSk7Ci0JCXdyaXRldygweGZmZmYsIE5GQ19W MjFfVU5MT0NLRU5EX0JMS0FERFIyKTsKLQkJd3JpdGV3KDB4ZmZmZiwgTkZDX1YyMV9VTkxPQ0tF TkRfQkxLQUREUjMpOwotCX0gZWxzZSBpZiAobmZjX2lzX3YxKCkpIHsKLQkJd3JpdGV3KDB4MCwg TkZDX1YxX1VOTE9DS1NUQVJUX0JMS0FERFIpOwotCQl3cml0ZXcoMHhmZmZmLCBORkNfVjFfVU5M T0NLRU5EX0JMS0FERFIpOwotCX0gZWxzZQotCQlCVUcoKTsKKwl3cml0ZXcoMHgwLCBORkNfVjIx X1VOTE9DS1NUQVJUX0JMS0FERFIwKTsKKwl3cml0ZXcoMHgwLCBORkNfVjIxX1VOTE9DS1NUQVJU X0JMS0FERFIxKTsKKwl3cml0ZXcoMHgwLCBORkNfVjIxX1VOTE9DS1NUQVJUX0JMS0FERFIyKTsK Kwl3cml0ZXcoMHgwLCBORkNfVjIxX1VOTE9DS1NUQVJUX0JMS0FERFIzKTsKKwl3cml0ZXcoMHhm ZmZmLCBORkNfVjIxX1VOTE9DS0VORF9CTEtBRERSMCk7CisJd3JpdGV3KDB4ZmZmZiwgTkZDX1Yy MV9VTkxPQ0tFTkRfQkxLQUREUjEpOworCXdyaXRldygweGZmZmYsIE5GQ19WMjFfVU5MT0NLRU5E X0JMS0FERFIyKTsKKwl3cml0ZXcoMHhmZmZmLCBORkNfVjIxX1VOTE9DS0VORF9CTEtBRERSMyk7 CiAKIAkvKiBVbmxvY2sgQmxvY2sgQ29tbWFuZCBmb3IgZ2l2ZW4gYWRkcmVzcyByYW5nZSAqLwog CXdyaXRldygweDQsIE5GQ19WMV9WMl9XUlBST1QpOwpAQCAtMTA1NywyNiArMTEwNSwyOCBAQCBz dGF0aWMgc3RydWN0IG5hbmRfYmJ0X2Rlc2NyIGJidF9taXJyb3JfZGVzY3IgPSB7CiAKIC8qIHYx OiAyMSwgMjcsIDMxICovCiBzdGF0aWMgY29uc3Qgc3RydWN0IG14Y19uYW5kX2RldnR5cGVfZGF0 YSBpbXgyMV9uYW5kX2RldnR5cGVfZGF0YSA9IHsKLQkucHJlc2V0ID0gcHJlc2V0X3YxX3YyLAor CS5wcmVzZXQgPSBwcmVzZXRfdjEsCiAJLnNlbmRfY21kID0gc2VuZF9jbWRfdjFfdjIsCiAJLnNl bmRfYWRkciA9IHNlbmRfYWRkcl92MV92MiwKLQkuc2VuZF9wYWdlID0gc2VuZF9wYWdlX3YxX3Yy LAorCS5zZW5kX3BhZ2UgPSBzZW5kX3BhZ2VfdjEsCiAJLnNlbmRfcmVhZF9pZCA9IHNlbmRfcmVh ZF9pZF92MV92MiwKIAkuZ2V0X2Rldl9zdGF0dXMgPSBnZXRfZGV2X3N0YXR1c192MV92MiwKIAku Y2hlY2tfaW50ID0gY2hlY2tfaW50X3YxX3YyLAogCS5pcnFfY29udHJvbCA9IGlycV9jb250cm9s X3YxX3YyLAorCS5nZXRfZWNjX3N0YXR1cyA9IGdldF9lY2Nfc3RhdHVzX3YxLAogfTsKIAogLyog djIxOiAyNSwgMzUgKi8KIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbXhjX25hbmRfZGV2dHlwZV9kYXRh IGlteDI1X25hbmRfZGV2dHlwZV9kYXRhID0gewotCS5wcmVzZXQgPSBwcmVzZXRfdjFfdjIsCisJ LnByZXNldCA9IHByZXNldF92MiwKIAkuc2VuZF9jbWQgPSBzZW5kX2NtZF92MV92MiwKIAkuc2Vu ZF9hZGRyID0gc2VuZF9hZGRyX3YxX3YyLAotCS5zZW5kX3BhZ2UgPSBzZW5kX3BhZ2VfdjFfdjIs CisJLnNlbmRfcGFnZSA9IHNlbmRfcGFnZV92MiwKIAkuc2VuZF9yZWFkX2lkID0gc2VuZF9yZWFk X2lkX3YxX3YyLAogCS5nZXRfZGV2X3N0YXR1cyA9IGdldF9kZXZfc3RhdHVzX3YxX3YyLAogCS5j aGVja19pbnQgPSBjaGVja19pbnRfdjFfdjIsCiAJLmlycV9jb250cm9sID0gaXJxX2NvbnRyb2xf djFfdjIsCisJLmdldF9lY2Nfc3RhdHVzID0gZ2V0X2VjY19zdGF0dXNfdjIsCiB9OwogCiAvKiB2 MzogNTEsIDUzICovCkBAIC0xMDg5LDYgKzExMzksNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IG14 Y19uYW5kX2RldnR5cGVfZGF0YSBpbXg1MV9uYW5kX2RldnR5cGVfZGF0YSA9IHsKIAkuZ2V0X2Rl dl9zdGF0dXMgPSBnZXRfZGV2X3N0YXR1c192MywKIAkuY2hlY2tfaW50ID0gY2hlY2tfaW50X3Yz LAogCS5pcnFfY29udHJvbCA9IGlycV9jb250cm9sX3YzLAorCS5nZXRfZWNjX3N0YXR1cyA9IGdl dF9lY2Nfc3RhdHVzX3YzLAogfTsKIAogc3RhdGljIGludCBfX2luaXQgbXhjbmRfcHJvYmUoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKLS0gCjEuNy4xMAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eCBNVEQgZGlzY3Vzc2lv biBtYWlsaW5nIGxpc3QKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5m by9saW51eC1tdGQvCg==