From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V10 2/3] mtd: rename "ofpart" parser to "fixed-partitions" as it fits it better Date: Wed, 14 Mar 2018 13:10:43 +0100 Message-ID: <20180314121044.12033-3-zajec5@gmail.com> References: <20180130201059.4424-1-zajec5@gmail.com> <20180314121044.12033-1-zajec5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180314121044.12033-1-zajec5@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: Brian Norris , David Woodhouse , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Rob Herring Cc: Mark Rutland , devicetree@vger.kernel.org, Florian Fainelli , Geert Uytterhoeven , Linus Walleij , John Crispin , linux-mtd@lists.infradead.org, Jonas Gorski , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Frank Rowand , Peter Rosin List-Id: devicetree@vger.kernel.org RnJvbTogUmFmYcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgoKVHlwZSAib2ZwYXJ0IiBt ZWFucyB0aGF0IE9GIHNob3VsZCBiZSB1c2VkIHRvIGdldCBwYXJ0aXRpb25pbmcgaW5mbyBhbmQK dGhpcyBkcml2ZXIgc3VwcG9ydHMgImZpeGVkLXBhcnRpdGlvbnMiIGJpbmRpbmcgb25seS4gUmVu YW1pbmcgaXQgc2hvdWxkCmxlYWQgdG8gbGVzcyBjb25mdXNpb24gZXNwZWNpYWxseSB3aGVuIHBh cnNlcnMgZm9yIG5ldyBjb21wYXRpYmlsaXR5CnN0cmluZ3Mgc3RhcnQgdG8gYXBwZWFyLgoKU2ln bmVkLW9mZi1ieTogUmFmYcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgotLS0KIGRyaXZl cnMvbXRkL210ZHBhcnQuYyB8ICA0ICsrLS0KIGRyaXZlcnMvbXRkL29mcGFydC5jICB8IDExICsr KysrKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9tdGRwYXJ0LmMgYi9kcml2ZXJzL210ZC9tdGRw YXJ0LmMKaW5kZXggMTA1ZmUyYzc3MjljLi5jZGIxZjQ5NmFiOTUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvbXRkL210ZHBhcnQuYworKysgYi9kcml2ZXJzL210ZC9tdGRwYXJ0LmMKQEAgLTkwNyw3ICs5 MDcsNyBAQCBzdGF0aWMgaW50IG10ZF9wYXJ0X29mX3BhcnNlKHN0cnVjdCBtdGRfaW5mbyAqbWFz dGVyLAogCXN0cnVjdCBkZXZpY2Vfbm9kZSAqbnA7CiAJc3RydWN0IHByb3BlcnR5ICpwcm9wOwog CWNvbnN0IGNoYXIgKmNvbXBhdDsKLQljb25zdCBjaGFyICpmaXhlZCA9ICJvZnBhcnQiOworCWNv bnN0IGNoYXIgKmZpeGVkID0gImZpeGVkLXBhcnRpdGlvbnMiOwogCWludCByZXQsIGVyciA9IDA7 CiAKIAlucCA9IG9mX2dldF9jaGlsZF9ieV9uYW1lKG10ZF9nZXRfb2Zfbm9kZShtYXN0ZXIpLCAi cGFydGl0aW9ucyIpOwpAQCAtOTI3LDcgKzkyNyw3IEBAIHN0YXRpYyBpbnQgbXRkX3BhcnRfb2Zf cGFyc2Uoc3RydWN0IG10ZF9pbmZvICptYXN0ZXIsCiAJb2Zfbm9kZV9wdXQobnApOwogCiAJLyoK LQkgKiBGb3IgYmFja3dhcmQgY29tcGF0aWJpbGl0eSB3ZSBoYXZlIHRvIHRyeSB0aGUgIm9mcGFy dCIKKwkgKiBGb3IgYmFja3dhcmQgY29tcGF0aWJpbGl0eSB3ZSBoYXZlIHRvIHRyeSB0aGUgImZp eGVkLXBhcnRpdGlvbnMiCiAJICogcGFyc2VyLiBJdCBzdXBwb3J0cyBvbGQgRFQgZm9ybWF0IHdp dGggcGFydGl0aW9ucyBzcGVjaWZpZWQgYXMgYQogCSAqIGRpcmVjdCBzdWJub2RlcyBvZiBhIGZs YXNoIGRldmljZSBEVCBub2RlIHdpdGhvdXQgYW55IGNvbXBhdGliaWxpdHkKIAkgKiBzcGVjaWZp ZWQgd2UgY291bGQgbWF0Y2guCmRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9vZnBhcnQuYyBiL2Ry aXZlcnMvbXRkL29mcGFydC5jCmluZGV4IDZiZGY0ZTUyNTY3Ny4uOWY0OTczMTVlNjVkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL210ZC9vZnBhcnQuYworKysgYi9kcml2ZXJzL210ZC9vZnBhcnQuYwpA QCAtMjUsOSArMjUsOSBAQCBzdGF0aWMgYm9vbCBub2RlX2hhc19jb21wYXRpYmxlKHN0cnVjdCBk ZXZpY2Vfbm9kZSAqcHApCiAJcmV0dXJuIG9mX2dldF9wcm9wZXJ0eShwcCwgImNvbXBhdGlibGUi LCBOVUxMKTsKIH0KIAotc3RhdGljIGludCBwYXJzZV9vZnBhcnRfcGFydGl0aW9ucyhzdHJ1Y3Qg bXRkX2luZm8gKm1hc3RlciwKLQkJCQkgICBjb25zdCBzdHJ1Y3QgbXRkX3BhcnRpdGlvbiAqKnBw YXJ0cywKLQkJCQkgICBzdHJ1Y3QgbXRkX3BhcnRfcGFyc2VyX2RhdGEgKmRhdGEpCitzdGF0aWMg aW50IHBhcnNlX2ZpeGVkX3BhcnRpdGlvbnMoc3RydWN0IG10ZF9pbmZvICptYXN0ZXIsCisJCQkJ ICBjb25zdCBzdHJ1Y3QgbXRkX3BhcnRpdGlvbiAqKnBwYXJ0cywKKwkJCQkgIHN0cnVjdCBtdGRf cGFydF9wYXJzZXJfZGF0YSAqZGF0YSkKIHsKIAlzdHJ1Y3QgbXRkX3BhcnRpdGlvbiAqcGFydHM7 CiAJc3RydWN0IGRldmljZV9ub2RlICptdGRfbm9kZTsKQEAgLTE0MSw4ICsxNDEsOCBAQCBzdGF0 aWMgaW50IHBhcnNlX29mcGFydF9wYXJ0aXRpb25zKHN0cnVjdCBtdGRfaW5mbyAqbWFzdGVyLAog fQogCiBzdGF0aWMgc3RydWN0IG10ZF9wYXJ0X3BhcnNlciBvZnBhcnRfcGFyc2VyID0gewotCS5w YXJzZV9mbiA9IHBhcnNlX29mcGFydF9wYXJ0aXRpb25zLAotCS5uYW1lID0gIm9mcGFydCIsCisJ LnBhcnNlX2ZuID0gcGFyc2VfZml4ZWRfcGFydGl0aW9ucywKKwkubmFtZSA9ICJmaXhlZC1wYXJ0 aXRpb25zIiwKIH07CiAKIHN0YXRpYyBpbnQgcGFyc2Vfb2ZvbGRwYXJ0X3BhcnRpdGlvbnMoc3Ry dWN0IG10ZF9pbmZvICptYXN0ZXIsCkBAIC0yMjksNCArMjI5LDUgQEAgTU9EVUxFX0FVVEhPUigi Vml0YWx5IFdvb2wsIERhdmlkIEdpYnNvbiIpOwogICogd2l0aCB0aGUgc2FtZSBuYW1lLiBTaW5j ZSB3ZSBwcm92aWRlIHRoZSBvZm9sZHBhcnQgcGFyc2VyLCB3ZSBzaG91bGQgaGF2ZQogICogdGhl IGNvcnJlc3BvbmRpbmcgYWxpYXMuCiAgKi8KK01PRFVMRV9BTElBUygiZml4ZWQtcGFydGl0aW9u cyIpOwogTU9EVUxFX0FMSUFTKCJvZm9sZHBhcnQiKTsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eCBNVEQgZGlz Y3Vzc2lvbiBtYWlsaW5nIGxpc3QKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9s aXN0aW5mby9saW51eC1tdGQvCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew5FP-00072k-Fa for linux-mtd@lists.infradead.org; Wed, 14 Mar 2018 12:11:13 +0000 Received: by mail-lf0-x241.google.com with SMTP id w16-v6so4380225lfc.13 for ; Wed, 14 Mar 2018 05:11:01 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Brian Norris , David Woodhouse , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Rob Herring Cc: Mark Rutland , Frank Rowand , Linus Walleij , linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, Geert Uytterhoeven , Jonas Gorski , Florian Fainelli , John Crispin , Peter Rosin , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V10 2/3] mtd: rename "ofpart" parser to "fixed-partitions" as it fits it better Date: Wed, 14 Mar 2018 13:10:43 +0100 Message-Id: <20180314121044.12033-3-zajec5@gmail.com> In-Reply-To: <20180314121044.12033-1-zajec5@gmail.com> References: <20180130201059.4424-1-zajec5@gmail.com> <20180314121044.12033-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Rafał Miłecki Type "ofpart" means that OF should be used to get partitioning info and this driver supports "fixed-partitions" binding only. Renaming it should lead to less confusion especially when parsers for new compatibility strings start to appear. Signed-off-by: Rafał Miłecki --- drivers/mtd/mtdpart.c | 4 ++-- drivers/mtd/ofpart.c | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 105fe2c7729c..cdb1f496ab95 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -907,7 +907,7 @@ static int mtd_part_of_parse(struct mtd_info *master, struct device_node *np; struct property *prop; const char *compat; - const char *fixed = "ofpart"; + const char *fixed = "fixed-partitions"; int ret, err = 0; np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); @@ -927,7 +927,7 @@ static int mtd_part_of_parse(struct mtd_info *master, of_node_put(np); /* - * For backward compatibility we have to try the "ofpart" + * For backward compatibility we have to try the "fixed-partitions" * parser. It supports old DT format with partitions specified as a * direct subnodes of a flash device DT node without any compatibility * specified we could match. diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index 6bdf4e525677..9f497315e65d 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c @@ -25,9 +25,9 @@ static bool node_has_compatible(struct device_node *pp) return of_get_property(pp, "compatible", NULL); } -static int parse_ofpart_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) +static int parse_fixed_partitions(struct mtd_info *master, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) { struct mtd_partition *parts; struct device_node *mtd_node; @@ -141,8 +141,8 @@ static int parse_ofpart_partitions(struct mtd_info *master, } static struct mtd_part_parser ofpart_parser = { - .parse_fn = parse_ofpart_partitions, - .name = "ofpart", + .parse_fn = parse_fixed_partitions, + .name = "fixed-partitions", }; static int parse_ofoldpart_partitions(struct mtd_info *master, @@ -229,4 +229,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson"); * with the same name. Since we provide the ofoldpart parser, we should have * the corresponding alias. */ +MODULE_ALIAS("fixed-partitions"); MODULE_ALIAS("ofoldpart"); -- 2.11.0