From patchwork Mon Jan 15 14:35:19 2018 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: 860922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EWcVUs2k"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YRWVn5YB"; dkim-atps=neutral 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 3zKwrX4SkLz9t8H for ; Tue, 16 Jan 2018 01:35:56 +1100 (AEDT) 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=iYv7bKgPO/YeN9RegiJAUvIZoeKZiBtJkI0s650rLaA=; b=EWcVUs2k8Foz8n 5Ji7B8mmJDVeqALYn0EwFcS+kmLy2CNF6LkiORrjlE+bPN2Dr+DrHZ1dr4eOEEH4hj37I+fMqQ4mZ s9ufB89VkxIp6vTu1rlp1aLcV5eF9/FFAmppwylE4axwEFl5OcRzorpAHQWsZTL41NAhTpOW3o9A+ V++0G5ODt14dnRr40vJ07vi4fXFzYD0hsbaFzvo/yMvRwvvghMaToQ0+q4v+kl02dRxPVO0dQPWpm lvg1Bq+YE0QvXJxtDU2EOraQo6r7mfkMZVmGCTxeLA2Ec9EThfHK6T68dEbYuga9yHnjguu+Fl9Mi Egxdjt1Pe21qUZHWRmvQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eb5ra-0006Zk-Fj; Mon, 15 Jan 2018 14:35:50 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eb5rT-0006Lx-1u for linux-mtd@lists.infradead.org; Mon, 15 Jan 2018 14:35:45 +0000 Received: by mail-lf0-x244.google.com with SMTP id m8so13615830lfc.6 for ; Mon, 15 Jan 2018 06:35:32 -0800 (PST) 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=EYf9gHAPPl1lfhITaXqUR1KWpwNitX4pZmuVyAGzGYg=; b=YRWVn5YBI8SZR8rHEfdWgToZgU4SZdo4yITuDfWwzI/qqqXY5SWl3zla3yztdrmMi2 tKnGTfCTHa/Kd+3NYDvzqAKOrqj5HUjALu0h1KW4aN1HZbc3d7LGVnnS9iqnnyPg9GDl c4xVKWPGfhL0cGFSEa0ahhS8dg+DFrqhh2KIrs4DD/G/L58NggO7s4one2b0KXSNDCvx tB976y4YPgksNvt0nXNa1+Ze0eL3QOKpkZk5oiyfgf/NXlwvJSGQ7325JY8vrV7aEI+P qUr/3L/2y1JFPXTuTU0xkYmo6Hvb2K3Da6njlb9JQj3VxkJQOB6s1DGUzERJBMYxDvUn mYqg== 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=EYf9gHAPPl1lfhITaXqUR1KWpwNitX4pZmuVyAGzGYg=; b=Tom+hcuuDxvUM7HvYIqcp2t+jJOyJKEuQKG/TdTC7X/KxZMW5boAP8ZjN0Xh4JdSUE lmZCqFBRjDHP5Pqwm9l7A5Uq+c6rW9CZdYmAbtX9/m1SlyDdrF0QxJhjDksoNQsS8VOb hpXFeV1i9TlHtkra9d4m+bZf6pd3pSm2U3RdomKPHJMvl7sGf3Ynpq81Kgy0NLEwa53I xeaE5sCdApVumoWLaBJCbi18I7Je4/v/QEazp/6ej9y1Pez2+IUFLUQVIDkZ6xpGCJLi zBQYMeAwJy2/pTKvl3iDKyFLCgVAw/NFh1YVkwu5wc+DBiVbJfd4ZJrQnlE61S+/RDbG NIHA== X-Gm-Message-State: AKwxytdYG2lx7DcYzS13Dxnj/a1HjuQ3gtHwO63eSKPbYrYpOQEok1g2 ZMdM/mrno/TDrpGVZFjXkXI= X-Google-Smtp-Source: ACJfBosgDb6NpbQUIDI5NwNRm0fcLM6t43kbMkrHxgOqSmgDlH34HHTCxN3A954dTOM2l7W/53vMVA== X-Received: by 10.46.54.15 with SMTP id d15mr1656075lja.26.1516026930999; Mon, 15 Jan 2018 06:35:30 -0800 (PST) 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 b84sm1277550ljf.87.2018.01.15.06.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 06:35:30 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Brian Norris , David Woodhouse , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen Subject: [PATCH V3 2/2] mtd: get rid of the mtd_add_device_partitions function Date: Mon, 15 Jan 2018 15:35:19 +0100 Message-Id: <20180115143519.9845-3-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180115143519.9845-1-zajec5@gmail.com> References: <20180115132223.9974-1-zajec5@gmail.com> <20180115143519.9845-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180115_063543_230903_B7BAFF6E X-CRM114-Status: GOOD ( 15.84 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , linux-mtd@lists.infradead.org, Jonas Gorski Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki This simplifies code a bit by: 1) Avoiding an extra (tiny) function 2) Checking for amount of parsed (found) partitions just once 3) Avoiding clearing/filling struct mtd_partitions manually With this commit a proper functions are called directly from the mtd_device_parse_register. It doesn't need to use minor tricks like memsetting struct to 0 to trigger an expected mtd_add_device_partitions behavior. Signed-off-by: Rafał Miłecki --- V2: Simplify conditions in the mtd_device_parse_register (thanks Boris) --- drivers/mtd/mtdcore.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 3304199cca07..9baf93219873 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -636,21 +636,6 @@ int del_mtd_device(struct mtd_info *mtd) return ret; } -static int mtd_add_device_partitions(struct mtd_info *mtd, - struct mtd_partitions *parts) -{ - const struct mtd_partition *real_parts = parts->parts; - int nbparts = parts->nr_parts; - - if (!nbparts && !device_is_registered(&mtd->dev)) - return add_mtd_device(mtd); - - if (nbparts > 0) - return add_mtd_partitions(mtd, real_parts, nbparts); - - return 0; -} - /* * Set a few defaults based on the parent devices, if not provided by the * driver @@ -712,24 +697,20 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types, return ret; } - memset(&parsed, 0, sizeof(parsed)); - + /* Prefer parsed partitions over driver-provided fallback */ ret = parse_mtd_partitions(mtd, types, &parsed, parser_data); - if ((ret < 0 || parsed.nr_parts == 0) && parts && nr_parts) { - /* Fall back to driver-provided partitions */ - parsed = (struct mtd_partitions){ - .parts = parts, - .nr_parts = nr_parts, - }; - } else if (ret < 0) { - /* Didn't come up with parsed OR fallback partitions */ - pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n", - ret); - /* Don't abort on errors; we can still use unpartitioned MTD */ - memset(&parsed, 0, sizeof(parsed)); + if (!ret && parsed.nr_parts) { + parts = parsed.parts; + nr_parts = parsed.nr_parts; } - ret = mtd_add_device_partitions(mtd, &parsed); + if (nr_parts) + ret = add_mtd_partitions(mtd, parts, nr_parts); + else if (!device_is_registered(&mtd->dev)) + ret = add_mtd_device(mtd); + else + ret = 0; + if (ret) goto out;