Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759071AbcCEIxw (ORCPT ); Sat, 5 Mar 2016 03:53:52 -0500 Received: from down.free-electrons.com ([37.187.137.238]:37654 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753597AbcCEIxm (ORCPT ); Sat, 5 Mar 2016 03:53:42 -0500 Date: Sat, 5 Mar 2016 09:53:37 +0100 From: Boris Brezillon To: Brian Norris Cc: David Woodhouse , linux-mtd@lists.infradead.org, Daniel Mack , Haojian Zhuang , Robert Jarzmik , Kukjin Kim , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ralf Baechle , linux-mips@linux-mips.org, Nicolas Ferre , Jean-Christophe Plagniol-Villard , Alexandre Belloni , Wenyou Yang , Josh Wu , Ezequiel Garcia , Maxime Ripard , Chen-Yu Tsai , linux-sunxi@googlegroups.com, Stefan Agner , Kyungmin Park , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, punnaiah choudary kalluri , Priit Laes , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com, linux-api@vger.kernel.org Subject: Re: [PATCH v3 16/52] mtd: nand: use mtd_set_ecclayout() where appropriate Message-ID: <20160305095337.4a9e50fe@bbrezillon> In-Reply-To: <20160305022621.GN55664@google.com> References: <1456448280-27788-1-git-send-email-boris.brezillon@free-electrons.com> <1456448280-27788-17-git-send-email-boris.brezillon@free-electrons.com> <20160305022621.GN55664@google.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2025 Lines: 58 Hi Brian, On Fri, 4 Mar 2016 18:26:21 -0800 Brian Norris wrote: > On Fri, Feb 26, 2016 at 01:57:24AM +0100, Boris Brezillon wrote: > > Use the mtd_set_ecclayout() helper instead of directly assigning the > > mtd->ecclayout field. > > > > Signed-off-by: Boris Brezillon > > --- > > drivers/mtd/nand/nand_base.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > > index 17504f2..5093a3c 100644 > > --- a/drivers/mtd/nand/nand_base.c > > +++ b/drivers/mtd/nand/nand_base.c > > @@ -4288,7 +4288,7 @@ int nand_scan_tail(struct mtd_info *mtd) > > ecc->write_oob_raw = ecc->write_oob; > > > > /* propagate ecc info to mtd_info */ > > - mtd->ecclayout = ecc->layout; > > + mtd_set_ecclayout(mtd, ecc->layout); > > I'm having trouble applying this one. For the life of me, I can't figure > out where you got this context from. This block only appears much later > in nand_scan_tail()... > Patch 7 has moved this section upper in the function to avoid problems when calculating the number of available/free OOB bytes. > Do you think you could post a git tree with your intended changes? I may > just try to pull something in like that instead. Yep, it's there [1]. Note that this branch contains the two fixes I talked about with Harvey and Stephan. I also made a few changes to use ecc->total instead of calculating (ecc->steps * ecc->bytes). > > BTW, I'm not sure the OMAP refactorings are going to come in time, but I > was planning to pull those directly from the TI folks (i.e., they won't > be rebased on l2-mtd.git), since there's some intermingling of platform > changes there. I think I can fix the conflicts fine, but FYI. Okay, then I'll let you deal with those conflicts. I can check your conflict resolution if you're unsure. Thanks, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com