From patchwork Tue Oct 27 02:31:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 536429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DBC8D140DB4 for ; Tue, 27 Oct 2015 13:35:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=QYyele22; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zqu4U-0004iO-KP; Tue, 27 Oct 2015 02:33:10 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zqu4D-0004WL-O8 for linux-mtd@lists.infradead.org; Tue, 27 Oct 2015 02:32:55 +0000 Received: by pabla5 with SMTP id la5so13232067pab.0 for ; Mon, 26 Oct 2015 19:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aT9L9BFkXdib+HXbprdHu8CNcz+4zMwJKwayTwbbZ4M=; b=QYyele22u6/s81iFSBO0a62wTlJ2plu6sIeU/zZZqa5Y/f9Uk3PPmAwFYyBgjQN1rG 9+fejcK7z/dkwTLDDThyBcgKORyx4iKQzIqRUE/ggzgRobhdHYW4sOFUg/iIMfm09ae4 sI5OtW9JXilBIAcbN9FPVQF+BH3DeaHahfk12xhS7ggiawtzYY183jH+F3xRJXKqgUzl MOSa/fdsv7RaCdPhGhFoQGZYtbA0G57pzwVcF3/wpcRSwJqNUSqG0cJClDFH23I2apba 287++oSH8lPhbgohcg1lbHeH6XTryTY9Ejo1+R2GAMFy47nUYzv4qFQrE90ek+KNJMZo JGjw== X-Received: by 10.67.14.42 with SMTP id fd10mr25498825pad.11.1445913152956; Mon, 26 Oct 2015 19:32:32 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id po4sm36347135pbb.64.2015.10.26.19.32.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Oct 2015 19:32:32 -0700 (PDT) From: Brian Norris To: Subject: [PATCH 5/5] mtd: drop 'of_node' partition parser data Date: Mon, 26 Oct 2015 19:31:10 -0700 Message-Id: <1445913070-17950-6-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445913070-17950-1-git-send-email-computersforpeace@gmail.com> References: <1445913070-17950-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151026_193254_051044_331946DF X-CRM114-Status: GOOD ( 13.42 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c03:0:0:0:22b 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 (computersforpeace[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.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Boris Brezillon , linux-kernel@vger.kernel.org, Huang Shijie , Josh Wu , Kyungmin Park , Han Xu , Ezequiel Garcia , Scott Wood , Brian Norris , Robert Jarzmik MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This field is no longer used anywhere, as it is superseded by mtd->dev.of_node. Signed-off-by: Brian Norris --- drivers/mtd/ofpart.c | 14 ++++---------- include/linux/mtd/partitions.h | 4 ---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index a5dfd73cfc7d..4368badfc653 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c @@ -35,11 +35,8 @@ static int parse_ofpart_partitions(struct mtd_info *master, int nr_parts, i; - /* - * of_node can be provided through auxiliary parser data or (preferred) - * by assigning the master device - */ - node = data && data->of_node ? data->of_node : master->dev.of_node; + /* Pull of_node from the master device */ + node = master->dev.of_node; if (!node) return 0; @@ -121,11 +118,8 @@ static int parse_ofoldpart_partitions(struct mtd_info *master, } *part; const char *names; - /* - * of_node can be provided through auxiliary parser data or (preferred) - * by assigning the master device - */ - dp = data && data->of_node ? data->of_node : master->dev.of_node; + /* Pull of_node from the master device */ + dp = master->dev.of_node; if (!dp) return 0; diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index e742f34b67eb..773975a3c9e6 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -56,13 +56,9 @@ struct device_node; /** * struct mtd_part_parser_data - used to pass data to MTD partition parsers. * @origin: for RedBoot, start address of MTD device - * @of_node: for OF parsers, device node containing partitioning information. - * This field is deprecated, as the device node should simply be - * assigned to the master struct device. */ struct mtd_part_parser_data { unsigned long origin; - struct device_node *of_node; };