From patchwork Thu Apr 20 13:57:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 752819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w80nv34LZz9s4s for ; Thu, 20 Apr 2017 23:58:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tytj0haM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T46PWFUG"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SS5Ko43w8+qEzw4v+xq9rh7Ts2/WBIvc8F10qy/GV4E=; b=Tytj0haM1bIdkb unYWJfpmmWtx7gtr6IscspQJdUYOCvVm505OA2i/VHU4byxiHZh8aPHeJNc6gRdY4zVQx66KW+CyR ggq7Zr3xuPlRgmzUFneo0eCx7o2ciZEI9+drnQbadXYsTEA5bCnNjr6W9b5ZcCaAOzq7VdxmQJBzD KKjidT0mxrUDZusifdo97s6MF+8tyarge4MVYUZNb29FNjXOuJRl3Skv35aldft5P30myAU+I99nx lkAQHvrYjaMKmoqfQ5aCWu5CykdoKSJ+2BTC0tmWKszCP4U7tQLMf0siMxdqYk4p0ubeXTKeKzfvT Mmmy0Ber8sz/ZXY6+w6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1CbI-0008Mk-5O; Thu, 20 Apr 2017 13:58:24 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d1Caz-0007u4-Qk for linux-mtd@lists.infradead.org; Thu, 20 Apr 2017 13:58:10 +0000 Received: by mail-lf0-x241.google.com with SMTP id x72so5911343lfb.1 for ; Thu, 20 Apr 2017 06:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jj4gUN3MEDBsLrp+ENZw5klnKq31VKad/DAyahGdHqU=; b=T46PWFUGpODKM+PVAwHkA4AvP5dJaSze6j+KqiwztL1uJdxxYlVTRAr+ZyRTPpwJcM TfwJyNC33fzoKTGPRWtCFjVRtipoieiwgCDCw4ZT44SvU/m10sKMWY7RdBv+9ATPTX6b oKkpfA7lMxpgNFcH0FM1pvmonUopr+2ZNf56GZZJnJF4ho1HYbXa07/S3GLallE+9vf9 Fv0CtZQGTjZWQ9WNZLb9Fctg+McaqaGT8apFgNzHvunMA0OLt9A/GoMsYZsSe91vYAbI PgA5tQaUodNTBlznBaXgNREucMM69jIrVCvH16TpHhtZ3AhmW2rbDhIltsYgkzrjNoNH NbFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jj4gUN3MEDBsLrp+ENZw5klnKq31VKad/DAyahGdHqU=; b=O9itsbFuKKh11PsfDc+gy5vNcOzbQqWEOdJNBqnFSMzjoFeNUFS+M8ASWnC2J35dZM jjQKXQJQCGl/zqmT0/XavTYZii3TRGybWaIrzr1CqgEoXegqNskdddi2AMXblR4eTXo+ 5nki2dTOvg8Pz5FFSYP80iQ6wVBcYBb+D6Cn1ToeShLH/emcUXkrIJg9fae4MTD+GyvL ndIQX7ddGorXkBaUo/fexckqWr/64sTEgHWKOrAEtWJLFuMkhTHRdCaRWq9kIzXsnWhH c6FNBNK68m2Ufgt/K8rYwhXZNWlaVZkRysMuVBk8BZkvEwS1wYBIZI6EZQKReZQ4z0fK qNfw== X-Gm-Message-State: AN3rC/6FoAxQxo2RAp+0KBPvJLejDCFfEsYI/9T67XJ52Q1cQyZecXMK 2nGcoqIDyIAYzw== X-Received: by 10.25.234.25 with SMTP id i25mr2959976lfh.25.1492696664214; Thu, 20 Apr 2017 06:57:44 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 91sm1075260lja.53.2017.04.20.06.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 06:57:43 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen Subject: [PATCH RESEND 2/4] mtd: partitions: factor out code calling parser Date: Thu, 20 Apr 2017 15:57:29 +0200 Message-Id: <20170420135731.13272-3-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170420135731.13272-1-zajec5@gmail.com> References: <20170420135431.12585-1-zajec5@gmail.com> <20170420135731.13272-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170420_065806_433300_27DDD86E X-CRM114-Status: GOOD ( 14.03 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Linus Walleij , Rob Herring , linux-mtd@lists.infradead.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Frank Rowand Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Brian Norris This code is going to be reused for parsers matched using OF so let's factor it out to make this easier. Signed-off-by: Brian Norris Signed-off-by: Rafał Miłecki Acked-by: Brian Norris --- drivers/mtd/mtdpart.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 81e0b80237df..73c52f1a2e4c 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -840,6 +840,27 @@ static const char * const default_mtd_part_types[] = { NULL }; +static int mtd_part_do_parse(struct mtd_part_parser *parser, + struct mtd_info *master, + struct mtd_partitions *pparts, + struct mtd_part_parser_data *data) +{ + int ret; + + ret = (*parser->parse_fn)(master, &pparts->parts, data); + pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret); + if (ret <= 0) + return ret; + + pr_notice("%d %s partitions found on MTD device %s\n", ret, + parser->name, master->name); + + pparts->nr_parts = ret; + pparts->parser = parser; + + return ret; +} + /** * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) @@ -880,16 +901,10 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, parser ? parser->name : NULL); if (!parser) continue; - ret = (*parser->parse_fn)(master, &pparts->parts, data); - pr_debug("%s: parser %s: %i\n", - master->name, parser->name, ret); - if (ret > 0) { - printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", - ret, parser->name, master->name); - pparts->nr_parts = ret; - pparts->parser = parser; + ret = mtd_part_do_parse(parser, master, pparts, data); + /* Found partitions! */ + if (ret > 0) return 0; - } mtd_part_parser_put(parser); /* * Stash the first error we see; only report it if no parser