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 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 815F3C28CF6 for ; Thu, 26 Jul 2018 23:13:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2EFFC20862 for ; Thu, 26 Jul 2018 23:13:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EFFC20862 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 S1731724AbeG0Acv convert rfc822-to-8bit (ORCPT ); Thu, 26 Jul 2018 20:32:51 -0400 Received: from mail.bootlin.com ([62.4.15.54]:48615 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731231AbeG0Acu (ORCPT ); Thu, 26 Jul 2018 20:32:50 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 7C5C52082B; Fri, 27 Jul 2018 01:13:48 +0200 (CEST) Received: from xps13 (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id A99BE20618; Fri, 27 Jul 2018 01:13:46 +0200 (CEST) Date: Fri, 27 Jul 2018 01:13:46 +0200 From: Miquel Raynal To: Boris Brezillon Cc: Alexandre Belloni , Mans Rullgard , Maxime Ripard , Stefan Agner , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-mtd@lists.infradead.org, Kamal Dasu , Josh Wu , Marc Gonzalez , Marek Vasut , Chen-Yu Tsai , bcm-kernel-feedback-list@broadcom.com, Sylvain Lemieux , Wenyou Yang , Tudor Ambarus , Vladimir Zapolskiy , Harvey Hunt , linux-mediatek@lists.infradead.org, Matthias Brugger , Han Xu , Xiaolei Li , linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Richard Weinberger , Brian Norris , David Woodhouse Subject: Re: [PATCH v4 27/35] mtd: rawnand: sm_common: convert driver to nand_scan_with_ids() Message-ID: <20180727011346.3931dbe9@xps13> In-Reply-To: <20180726210655.03eca681@bbrezillon> References: <20180720151527.16038-1-miquel.raynal@bootlin.com> <20180720151527.16038-28-miquel.raynal@bootlin.com> <20180722084432.61b579b1@bbrezillon> <20180726210655.03eca681@bbrezillon> Organization: Bootlin 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=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Boris, Boris Brezillon wrote on Thu, 26 Jul 2018 21:06:55 +0200: > On Sun, 22 Jul 2018 08:44:32 +0200 > Boris Brezillon wrote: > > > 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); > > Didn't notice that while reviewing, but it would have been better to > use nand_cleanup() and do this change separately. Indeed, will fix it. Miquèl