From patchwork Thu Jun 9 14:22:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 99755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0558BB6FE1 for ; Fri, 10 Jun 2011 00:24:14 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QUg9S-0000lt-Fo; Thu, 09 Jun 2011 14:24:02 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QUg9S-0007gS-1S; Thu, 09 Jun 2011 14:24:02 +0000 Received: from mail-ww0-f49.google.com ([74.125.82.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QUg8j-0007V4-8H for linux-mtd@lists.infradead.org; Thu, 09 Jun 2011 14:23:18 +0000 Received: by mail-ww0-f49.google.com with SMTP id 39so1305393wwb.18 for ; Thu, 09 Jun 2011 07:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=WTYOCqMVJzCvKfBMG5jxwbsaQDnIyxWNco0HcxQ9scE=; b=HdD60bYIMPBHgT7WLIZNOwqfm7ZP44zwCrL0NleLfPU3t5+a3+R3xstDTFDTmlfZJe 3Z9+KY3UwpC6nsSekDxDRyXmDBH8no8ai74oU0wzqMMjFOMQA8b9UEnNvvtMD9KLRjYr nJDuoCS+FtqT3T0MfSg3DLlgqgdRBJOzjI0N0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=I3M8DfVKH7V4Yqgs93mI/1R8vi6o/kvtl7dVaOJ5s/7KOcMvL79p/YL7x7VimMcEYP EcLH8r5OVWJY6JyUqNsGM6T1WTqxccgI4D1Hp51MltIuXah5ZBygLK/6MkIBCvRuyl0a ac0/1HtBV6Ho/jY1W8FrcNaEUOAZUScD6tp08= Received: by 10.217.7.66 with SMTP id z44mr456083wes.100.1307629396842; Thu, 09 Jun 2011 07:23:16 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id b70sm872886wek.44.2011.06.09.07.23.15 (version=SSLv3 cipher=OTHER); Thu, 09 Jun 2011 07:23:15 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-mtd@lists.infradead.org Subject: [PATCH 05/17] mtd: fsl_upm: use ofpart through generic parsing Date: Thu, 9 Jun 2011 18:22:54 +0400 Message-Id: <1307629388-24769-6-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307629388-24769-1-git-send-email-dbaryshkov@gmail.com> References: <1307629388-24769-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110609_102317_517963_CC50B53D X-CRM114-Status: GOOD ( 10.78 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dbaryshkov[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: David Woodhouse , dedekind1@gmail.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Convert the driver to use ofpart partitions parsing through the generic parse_mtd_partitions(). Signed-off-by: Dmitry Eremin-Solenikov --- 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);