From patchwork Fri Jan 12 14:40:34 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: 859977 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="PJYV4+EM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TuDOzuUK"; 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 3zJ56C2zVMz9sNw for ; Sat, 13 Jan 2018 01:41:23 +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=Mkem1BhBHjzkV/ABVKbj8hAiNNJtUYdEcaEzsk/mJJ4=; b=PJYV4+EMH7vsBq D1UzKbl4S/tMPQddArUaoueeWyIKsvZymIkGcjwwD5ZkLzV4IuvRl5ojNmF9OcBo5QHcAIpvCaijl x88FSrOISwXQmbSd5aX+03VRFhGn6NWKBowJY5/bHv4626IR5o9CXckJs+cuIMX08Msvkh/PYH7wg 1wQ7ePnKn2kfy68v/5AdNFP8kLHwk8z3W3hz4n9vejqUmdipEE/MsaaxY2cilvhZr3giInVOAoakH TINT5n/yx0aRbdfSK+SH3kY+jH+C8oPrjr1HpFb2m3L9XNt2uhqeQT/V8YEMJYeyRNlb9DwU/TalH HqkaWaveEbVCaO+lJgzw==; 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 1ea0WD-00072n-Ej; Fri, 12 Jan 2018 14:41:17 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ea0Vz-0006fL-Cj for linux-mtd@lists.infradead.org; Fri, 12 Jan 2018 14:41:05 +0000 Received: by mail-lf0-x242.google.com with SMTP id a12so6155597lfe.13 for ; Fri, 12 Jan 2018 06:40:55 -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=pc7hvvZ6clyPc2fc/BhzQh6t3wtYxEo8F+7jDDYkOmc=; b=TuDOzuUKEXqVEgcOyZTjuzJLExN1msnR6aPsYOoSt28QdUVbkepWuMRFT1kC/GvueK fm7uCQzNYnd4kpSEA0yP59lsKbn5AqmRPZ57KDisSljfbj/yX3vszX992AnjVhd07mcj 0A7wjsfwkg/QW7sNseQgYxeUEy4t6uFrSv9czsY1RdNtC3H8KRKDLw88mSmNTjA10o25 0SQvnJt0zG9KGf144gGM5tQ1BPVCtIitQF1OQHw5agzLOQ99K+ozOIZpAbLafovawoLy e1qT317k8pbhtRmr5OzR64t0y32EENAgwCjITeOKgA/X5m4+tfKgBLXSzCtHDVm3JixN fE+A== 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=pc7hvvZ6clyPc2fc/BhzQh6t3wtYxEo8F+7jDDYkOmc=; b=qQ1FOW+MIkwUeW3usTsUuOfHal1ril7T3U8yPAKO0UM7eYWkNhVAE+SoNOuXMFYBxx BuZhJ7Xyt7gpeIfO7eYUzE7KRyl2Zl0jrYsHO6kWpyGt4LDSRh1EBhTxafpmJY3eyMfl yS12nv5UJ5GkH9WQQOqXsjo96ZipfX9bDSRAoPmonb2sBbVNurV+2YDFj8SL74o3vz3s yvezZnq4lfdi5onVqTCI1dljjH6eaCIqYZeVbxYJWX/0pDsVa7swCOw4U9U6+QPqT8+R sq9Qz1p7BaV8k41KEpr9oShPNtIIL+skdcisUtgeTVt6D7p3jxojCAfzdl0rOUJ3DWs5 ONDg== X-Gm-Message-State: AKGB3mJ/pNWQcb7Wi8ALoDUcQiXG/P4XvZqWUbv1XTvtc0KSbplAn9sk k0a/zoqUdY5DKT0FODjhfx0= X-Google-Smtp-Source: ACJfBotVMdAQXSND7N4NxWn8ARFhI95m2/2oI7Q92PegYkDArnplkeVqVgDVprISl1gJkzPzp29EoQ== X-Received: by 10.46.19.10 with SMTP id 10mr15043059ljt.131.1515768053931; Fri, 12 Jan 2018 06:40:53 -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 e72sm4400469lji.63.2018.01.12.06.40.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 06:40:53 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Brian Norris , David Woodhouse , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen Subject: [PATCH 2/2] mtd: get rid of the mtd_add_device_partitions function Date: Fri, 12 Jan 2018 15:40:34 +0100 Message-Id: <20180112144034.6655-3-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180112144034.6655-1-zajec5@gmail.com> References: <20180112144034.6655-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180112_064103_463241_9E2DC967 X-CRM114-Status: GOOD ( 15.55 ) 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:242 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: =?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 --- drivers/mtd/mtdcore.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index f6460862e2ad..0a414750bc8b 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 == 0 && !IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) - 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 @@ -717,19 +702,19 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types, 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, - }; + ret = add_mtd_partitions(mtd, 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 (!IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) + ret = add_mtd_device(mtd); + else + ret = 0; + } else { + ret = add_mtd_partitions(mtd, parsed.parts, parsed.nr_parts); } - - ret = mtd_add_device_partitions(mtd, &parsed); if (ret) goto out;