linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: linux-mtd@lists.infradead.org
Cc: David Woodhouse <dwmw2@infradead.org>, dedekind1@gmail.com
Subject: [PATCH 05/17] mtd: fsl_upm: use ofpart through generic parsing
Date: Thu,  9 Jun 2011 18:22:54 +0400	[thread overview]
Message-ID: <1307629388-24769-6-git-send-email-dbaryshkov@gmail.com> (raw)
In-Reply-To: <1307629388-24769-1-git-send-email-dbaryshkov@gmail.com>

Convert the driver to use ofpart partitions parsing through the generic
parse_mtd_partitions().

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 drivers/mtd/nand/fsl_upm.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 7c782eb..253b8ff 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -175,6 +175,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 
 	fun->mtd.priv = &fun->chip;
 	fun->mtd.owner = THIS_MODULE;
+	fun->mtd.node = flash_np;
 
 	flash_np = of_get_next_child(upm_np, NULL);
 	if (!flash_np)
@@ -193,13 +194,6 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 
 	ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, 0);
 
-#ifdef CONFIG_MTD_OF_PARTS
-	if (ret == 0) {
-		ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);
-		if (ret < 0)
-			goto err;
-	}
-#endif
 	ret = mtd_device_register(&fun->mtd, fun->parts, ret);
 err:
 	of_node_put(flash_np);
-- 
1.7.5.3

  parent reply	other threads:[~2011-06-09 14:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-09 14:22 [PATCH 00/17] mtd: last pile of MTD partition cleanup patches Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 01/17] mtd: prepare to convert of_mtd_parse_partitions to partition parser Dmitry Eremin-Solenikov
2011-06-09 14:26   ` Artem Bityutskiy
2011-06-09 14:37     ` Dmitry Eremin-Solenikov
2011-06-09 15:02       ` Artem Bityutskiy
2011-06-09 15:08         ` Dmitry Eremin-Solenikov
2011-06-09 15:17           ` Artem Bityutskiy
2011-06-09 15:20             ` Artem Bityutskiy
2011-06-09 15:25       ` Artem Bityutskiy
2011-06-09 14:22 ` [PATCH 02/17] mtd: physmap_of: use ofpart through generic parsing Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 03/17] mtd: m25p80: " Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 04/17] mtd: fsl_elbc_nand: " Dmitry Eremin-Solenikov
2011-06-09 14:22 ` Dmitry Eremin-Solenikov [this message]
2011-06-09 14:22 ` [PATCH 06/17] mtd: mpc5121_nfc: " Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 07/17] mtd: ndfc: " Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 08/17] mtd: socrates_nand: " Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 09/17] mtd: drop of_mtd_parse_partitions() Dmitry Eremin-Solenikov
2011-06-09 14:22 ` [PATCH 10/17] physmap_of: move parse_obsolete_partitions to become separate parser Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 11/17] mtd: m25p80.c: use mtd_device_parse_register Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 11/17] mtd: physmap_of.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 12/17] mtd: m25p80.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 12/17] mtd: physmap_of.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 13/17] mtd: fsl_elbc_nand.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 14/17] mtd: fsl_upm.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 15/17] mtd: mpc5121_nfc.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 16/17] mtd: ndfc.c: " Dmitry Eremin-Solenikov
2011-06-09 14:23 ` [PATCH 17/17] mtd: socrates_nand.c: " Dmitry Eremin-Solenikov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307629388-24769-6-git-send-email-dbaryshkov@gmail.com \
    --to=dbaryshkov@gmail.com \
    --cc=dedekind1@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-mtd@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).