From patchwork Thu Jun 2 14:51:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 98412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C67DB6F9F for ; Fri, 3 Jun 2011 00:55:27 +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 1QS9IK-0000ab-3e; Thu, 02 Jun 2011 14:54:44 +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 1QS9IJ-00081c-Ox; Thu, 02 Jun 2011 14:54:43 +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 1QS9Fj-00074g-Cu for linux-mtd@lists.infradead.org; Thu, 02 Jun 2011 14:52:04 +0000 Received: by mail-ww0-f49.google.com with SMTP id 39so758040wwb.18 for ; Thu, 02 Jun 2011 07:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=8lON4gYOfRzieF4USLAarUoMBHWcnx6KMwNeT/wLAaM=; b=gLHCZ6HChGJ3zvyv4Ic0HMsQnQ7Qfs//yazoLaYUDkjb9klMJC03SambgjoJcUH+zX IxhbFzV4TXOEZQZs0n7W91gFH6Yj2AK/5P78leu6tsdgtEZAA/kolYi7BQ9TED8nsSqu kBRyP0mxfVnoNYou803gdWZlAln97U+VTBmL0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=xfmF5Tpwwsocl+pCLdfZOI9hQ9jzN+mEYPY4WzX+f9Q5YRjRJ7WPGxV04yewOP6KQN WY9vyRKkMsuUNV3NPtwrSSTgEmERlT2rFZSEeKO5s63oJELGapqb1C+n44MNvvIsSUBe r9/057s6Jnsz7WNeM8GJUS8VPH54fBfBEAG8Y= Received: by 10.216.255.201 with SMTP id j51mr779395wes.94.1307026323029; Thu, 02 Jun 2011 07:52:03 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id k70sm368125weq.6.2011.06.02.07.52.01 (version=SSLv3 cipher=OTHER); Thu, 02 Jun 2011 07:52:02 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-mtd@lists.infradead.org Subject: [PATCH 054/104] mtd: add new API for handling MTD registration Date: Thu, 2 Jun 2011 18:51:32 +0400 Message-Id: <1307026293-8535-20-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307026293-8535-1-git-send-email-dbaryshkov@gmail.com> References: <1307026293-8535-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110602_105203_777608_B7611A88 X-CRM114-Status: GOOD ( 14.77 ) 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 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 Lots (nearly all) mtd drivers contain nearly the similar code that calls parse_mtd_partitions, provides some platform-default values, if parsing fails, and registers mtd device. This is an aim to provide single implementation of this scenario: mtd_device_parse_register() which will handle all this parsing and defaults. Signed-off-by: Dmitry Eremin-Solenikov --- drivers/mtd/mtdcore.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/linux/mtd/mtd.h | 5 +++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index bfd5a65..fdbfb0c 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -456,6 +456,46 @@ int mtd_device_register(struct mtd_info *master, } EXPORT_SYMBOL_GPL(mtd_device_register); +int mtd_device_parse_register(struct mtd_info *mtd, + const char **part_probe_types, + unsigned long origin, + const struct mtd_partition *defparts, + int defnr_parts) +{ + int err; + struct mtd_partition *parts; + + err = parse_mtd_partitions(mtd, part_probe_types, &parts, origin); + if (err <= 0 && defnr_parts) { + unsigned long size = sizeof(*parts) * defnr_parts; + err = defnr_parts; + parts = kzalloc(size, GFP_KERNEL); + memcpy(parts, defparts, size); + } + +#ifdef CONFIG_OF + if (mtd->node) + of_node_get(mtd->node); +#endif + + if (err > 0) { + err = add_mtd_partitions(mtd, parts, err); + kfree(parts); + } else { + err = add_mtd_device(mtd); + if (err == 1) + err = -ENODEV; + } + +#ifdef CONFIG_OF + if (err < 0 && mtd->node) + of_node_put(mtd->node); +#endif + + return err; +} +EXPORT_SYMBOL_GPL(mtd_device_parse_register); + /** * mtd_device_unregister - unregister an existing MTD device. * diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 14305d0..d8f5efe 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -330,6 +330,11 @@ struct mtd_partition; extern int mtd_device_register(struct mtd_info *master, const struct mtd_partition *parts, int nr_parts); +extern int mtd_device_parse_register(struct mtd_info *mtd, + const char **part_probe_types, + unsigned long origin, + const struct mtd_partition *defparts, + int defnr_parts); extern int mtd_device_unregister(struct mtd_info *master); extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num); extern int __get_mtd_device(struct mtd_info *mtd);