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 6DD5BC6778A for ; Sun, 22 Jul 2018 06:44:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CA482086A for ; Sun, 22 Jul 2018 06:44:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CA482086A 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 S1727994AbeGVHkY (ORCPT ); Sun, 22 Jul 2018 03:40:24 -0400 Received: from mail.bootlin.com ([62.4.15.54]:58361 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727764AbeGVHkY (ORCPT ); Sun, 22 Jul 2018 03:40:24 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 993F1206A6; Sun, 22 Jul 2018 08:44:45 +0200 (CEST) Received: from bbrezillon (unknown [37.173.105.99]) by mail.bootlin.com (Postfix) with ESMTPSA id B6BCF203EC; Sun, 22 Jul 2018 08:44:33 +0200 (CEST) Date: Sun, 22 Jul 2018 08:44:32 +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 27/35] mtd: rawnand: sm_common: convert driver to nand_scan_with_ids() Message-ID: <20180722084432.61b579b1@bbrezillon> In-Reply-To: <20180720151527.16038-28-miquel.raynal@bootlin.com> References: <20180720151527.16038-1-miquel.raynal@bootlin.com> <20180720151527.16038-28-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:19 +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_with_ids() > (alternative to nand_scan() for passing a flash IDs table) instead of > both nand_scan_ident() and nand_scan_tail(). > > Signed-off-by: Miquel Raynal Reviewed-by: Boris Brezillon > --- > drivers/mtd/nand/raw/sm_common.c | 39 +++++++++++++++++++++++++-------------- > 1 file changed, 25 insertions(+), 14 deletions(-) > > diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c > index 7f5044a79f01..d05e3f976a5e 100644 > --- a/drivers/mtd/nand/raw/sm_common.c > +++ b/drivers/mtd/nand/raw/sm_common.c > @@ -160,19 +160,9 @@ static struct nand_flash_dev nand_xd_flash_ids[] = { > {NULL} > }; > > -int sm_register_device(struct mtd_info *mtd, int smartmedia) > +static int sm_attach_chip(struct nand_chip *chip) > { > - struct nand_chip *chip = mtd_to_nand(mtd); > - int ret; > - > - chip->options |= NAND_SKIP_BBTSCAN; > - > - /* Scan for card properties */ > - ret = nand_scan_ident(mtd, 1, smartmedia ? > - nand_smartmedia_flash_ids : nand_xd_flash_ids); > - > - if (ret) > - return ret; > + struct mtd_info *mtd = nand_to_mtd(chip); > > /* Bad block marker position */ > chip->badblockpos = 0x05; > @@ -187,12 +177,33 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia) > else > return -ENODEV; > > - ret = nand_scan_tail(mtd); > + return 0; > +} > > +static const struct nand_controller_ops sm_controller_ops = { > + .attach_chip = sm_attach_chip, > +}; > + > +int sm_register_device(struct mtd_info *mtd, int smartmedia) > +{ > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nand_flash_dev *flash_ids; > + int ret; > + > + chip->options |= NAND_SKIP_BBTSCAN; > + > + /* Scan for card properties */ > + chip->dummy_controller.ops = &sm_controller_ops; > + flash_ids = smartmedia ? nand_smartmedia_flash_ids : nand_xd_flash_ids; > + ret = nand_scan_with_ids(mtd, 1, flash_ids); > if (ret) > return ret; > > - return mtd_device_register(mtd, NULL, 0); > + ret = mtd_device_register(mtd, NULL, 0); > + if (ret) > + nand_release(mtd); > + > + return ret; > } > EXPORT_SYMBOL_GPL(sm_register_device); >