From patchwork Fri Mar 2 17:03:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 36BF46037F for ; Fri, 2 Mar 2018 18:21:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2626127D0C for ; Fri, 2 Mar 2018 18:21:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1ABDA27F98; Fri, 2 Mar 2018 18:21:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9393627D0C for ; Fri, 2 Mar 2018 18:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=pwP4Yr0xiLTq1SdTI61aTMsjIKDnAbp1VfQNpVKYtcQ=; b=pcrnS0ibdYKaSOALVIr3LzlBNx 21PWXcM+nhmHPLaHkGLXyyKb6PLDoWsJ9mrpq44JsnhAU3NcZgpOAtEvXaaV8mUgvxsQmQURs5WKb 6zQ8ozSklIK0Es9LXB0iPn83AdsQnaLC/MEEcIu11yyysiyRDCJckoOjCKBrKCN+ot3Qzlm0xOvex 1upIS5Kq4mx08lBmxNJagiXUQaDbQ3gQJLlWPdkpSi4XX/hzuh2I1YanFZFbfuUbUFZKqa13G1vpx xpyift5jBE8KNoLci/D+3al2Q/TirlG9QbGdAAZ7CG2mTSgNsyGMv5TtdcTWKPR1Ob6ED6UT55kgO ZEhCS0Yw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erpJV-0001ZN-Qo; Fri, 02 Mar 2018 18:21:49 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erpC1-0001qC-T6; Fri, 02 Mar 2018 18:14:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YX4KAbymnztK+Ic2bAa/y8hhCZN4Yya4XzUN4XNDS4o=; b=DYbe8vg52EAYJxJcxOnC1oM+O lqAM1g8+jbL2rNUwCt5gR8DLO4Up+GWirjdl8wOVNz1o5EUcEIeubC7g2JmQ9ZbldKAWzhVwJXZr2 ql1O4rwk0iw0jCBb2iO/X/1cyHnLdoLAIkuIRpXT1rryZnngp8zjmhB0d/Humy+vVjGecOz9DBsgc DEdThQBFxQXNiMyyRrMQdHyY+b4biCxyNQNZ5kTXpjEhy5w2j9CH3bBz47CYBtP9wMZz5lkKXmv5q BFF7DvfuVLOeJTRzi3E3uf1YI3jr3zhtZ6Kotc7rTLuK95Zrc616qqRZKOblGxYBCK1bdEOCKqyw3 bWV1EJPJg==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7A-00075a-Rh; Fri, 02 Mar 2018 17:05:03 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 05139209EC; Fri, 2 Mar 2018 18:04:37 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 1B92820379; Fri, 2 Mar 2018 18:04:36 +0100 (CET) From: Miquel Raynal To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Josh Wu , Kamal Dasu , Harvey Hunt , Stefan Agner Subject: [PATCH 37/52] mtd: rawnand: sh_flctl: convert driver to nand_scan() Date: Fri, 2 Mar 2018 18:03:45 +0100 Message-Id: <20180302170400.6712-38-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180302170400.6712-1-miquel.raynal@bootlin.com> References: <20180302170400.6712-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180302_120501_110389_C7FB6C2F X-CRM114-Status: GOOD ( 12.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/mtd/nand/raw/sh_flctl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c index 67f125d56771..0f1b7db4fe7f 100644 --- a/drivers/mtd/nand/raw/sh_flctl.c +++ b/drivers/mtd/nand/raw/sh_flctl.c @@ -1002,10 +1002,10 @@ static void flctl_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) flctl->index += len; } -static int flctl_chip_init_tail(struct mtd_info *mtd) +static int flctl_chip_attach_chip(struct nand_chip *chip) { + struct mtd_info *mtd = nand_to_mtd(chip); struct sh_flctl *flctl = mtd_to_flctl(mtd); - struct nand_chip *chip = &flctl->chip; if (chip->options & NAND_BUSWIDTH_16) { /* @@ -1200,15 +1200,8 @@ static int flctl_probe(struct platform_device *pdev) flctl_setup_dma(flctl); - ret = nand_scan_ident(flctl_mtd, 1, NULL); - if (ret) - goto err_chip; - - ret = flctl_chip_init_tail(flctl_mtd); - if (ret) - goto err_chip; - - ret = nand_scan_tail(flctl_mtd); + nand->ecc.attach_chip = flctl_chip_attach_chip; + ret = nand_scan(flctl_mtd, 1); if (ret) goto err_chip;