From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F277ECDE5F for ; Sat, 21 Jul 2018 17:55:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C33F520849 for ; Sat, 21 Jul 2018 17:55:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C33F520849 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728318AbeGUStF (ORCPT ); Sat, 21 Jul 2018 14:49:05 -0400 Received: from mail.bootlin.com ([62.4.15.54]:50458 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727554AbeGUStE (ORCPT ); Sat, 21 Jul 2018 14:49:04 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 59AE720717; Sat, 21 Jul 2018 19:55:30 +0200 (CEST) Received: from bbrezillon (unknown [37.173.79.60]) by mail.bootlin.com (Postfix) with ESMTPSA id 731D12095C; Sat, 21 Jul 2018 19:54:39 +0200 (CEST) Date: Sat, 21 Jul 2018 19:54:38 +0200 From: Boris Brezillon To: Miquel Raynal Cc: Wenyou Yang , Josh Wu , Tudor Ambarus , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Nicolas Ferre , Alexandre Belloni , Kamal Dasu , Masahiro Yamada , Han Xu , Harvey Hunt , Vladimir Zapolskiy , Sylvain Lemieux , Xiaolei Li , Matthias Brugger , Maxime Ripard , Chen-Yu Tsai , Marc Gonzalez , Mans Rullgard , Stefan Agner , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-mediatek@lists.infradead.org Subject: Re: [PATCH v4 24/35] mtd: rawnand: txx9ndfmc: convert driver to nand_scan() Message-ID: <20180721195438.03e092b1@bbrezillon> In-Reply-To: <20180720151527.16038-25-miquel.raynal@bootlin.com> References: <20180720151527.16038-1-miquel.raynal@bootlin.com> <20180720151527.16038-25-miquel.raynal@bootlin.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Jul 2018 17:15:16 +0200 Miquel Raynal wrote: > Two helpers have been added to the core to make ECC-related > configuration between the detection phase and the final NAND scan. Use > these hooks and convert the driver to just use nand_scan() instead of > both nand_scan_ident() and nand_scan_tail(). > > Signed-off-by: Miquel Raynal Reviewed-by: Boris Brezillon > --- > drivers/mtd/nand/raw/txx9ndfmc.c | 29 +++++++++++++++-------------- > 1 file changed, 15 insertions(+), 14 deletions(-) > > diff --git a/drivers/mtd/nand/raw/txx9ndfmc.c b/drivers/mtd/nand/raw/txx9ndfmc.c > index 9019022774f7..0134beb1136d 100644 > --- a/drivers/mtd/nand/raw/txx9ndfmc.c > +++ b/drivers/mtd/nand/raw/txx9ndfmc.c > @@ -254,23 +254,23 @@ static void txx9ndfmc_initialize(struct platform_device *dev) > #define TXX9NDFMC_NS_TO_CYC(gbusclk, ns) \ > DIV_ROUND_UP((ns) * DIV_ROUND_UP(gbusclk, 1000), 1000000) > > -static int txx9ndfmc_nand_scan(struct mtd_info *mtd) > +static int txx9ndfmc_attach_chip(struct nand_chip *chip) > { > - struct nand_chip *chip = mtd_to_nand(mtd); > - int ret; > + struct mtd_info *mtd = nand_to_mtd(chip); > > - ret = nand_scan_ident(mtd, 1, NULL); > - if (!ret) { > - if (mtd->writesize >= 512) { > - /* Hardware ECC 6 byte ECC per 512 Byte data */ > - chip->ecc.size = 512; > - chip->ecc.bytes = 6; > - } > - ret = nand_scan_tail(mtd); > + if (mtd->writesize >= 512) { > + /* Hardware ECC 6 byte ECC per 512 Byte data */ > + chip->ecc.size = 512; > + chip->ecc.bytes = 6; > } > - return ret; > + > + return 0; > } > > +static const struct nand_controller_ops txx9ndfmc_controller_ops = { > + .attach_chip = txx9ndfmc_attach_chip, > +}; > + > static int __init txx9ndfmc_probe(struct platform_device *dev) > { > struct txx9ndfmc_platform_data *plat = dev_get_platdata(&dev->dev); > @@ -304,6 +304,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) > (gbusclk + 500000) / 1000000, hold, spw); > > nand_controller_init(&drvdata->controller); > + drvdata->controller.ops = &txx9ndfmc_controller_ops; > > platform_set_drvdata(dev, drvdata); > txx9ndfmc_initialize(dev); > @@ -332,7 +333,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) > chip->ecc.correct = txx9ndfmc_correct_data; > chip->ecc.hwctl = txx9ndfmc_enable_hwecc; > chip->ecc.mode = NAND_ECC_HW; > - /* txx9ndfmc_nand_scan will overwrite ecc.size and ecc.bytes */ > + /* nand_scan() will overwrite ecc.size and ecc.bytes */ > chip->ecc.size = 256; > chip->ecc.bytes = 3; > chip->ecc.strength = 1; > @@ -359,7 +360,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) > if (plat->wide_mask & (1 << i)) > chip->options |= NAND_BUSWIDTH_16; > > - if (txx9ndfmc_nand_scan(mtd)) { > + if (nand_scan(mtd, 1)) { > kfree(txx9_priv->mtdname); > kfree(txx9_priv); > continue;