From patchwork Fri Mar 2 17:03:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255367 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 D34146037F for ; Fri, 2 Mar 2018 18:20:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1BAB27D0C for ; Fri, 2 Mar 2018 18:20:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5CFB27FA1; Fri, 2 Mar 2018 18:20:31 +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 3CE1B27D0C for ; Fri, 2 Mar 2018 18:20:31 +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=nTDoveGGIKj9ujs/811F8S83gJ5OTFJ2zP/KA4i8pVA=; b=i98VafeeaS+j7COKyHWezBqgV8 oAMHEs2NW1tcks0O/kydyqFSiA8eLLOcjqM36X8rOpprHd/Y8LVIuZabsHHrVuYjBucMFq0J7Ex/Z 8iKmjn8SWEPMNN/Xoc3wVpIk7WeTpaRyZbuJ7UnfcCOr0UOZDXKD8EyvP4/LSEL1Ar34G770OE+uK YVCbqrabOjf3PyCksclEnS8Yxqn3Gmq9k5df1WzuOHLYeyHollVuvnXHhp8wd1cepySswI79DBoh/ +Y0Blg5CtudC6SN1mUFrC3uIYL95qX+B430IdV8h30D40yC/xbjYQAGxH7HcHCfdjGA4iLo8Kh30Y LkbVFIvw==; 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 1erpI0-0008EF-AR; Fri, 02 Mar 2018 18:20:16 +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 1erpBy-0001qC-SE; Fri, 02 Mar 2018 18:14:02 +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=8YPJZQsbUjuvWnDXhgxDI/WRx1cq5IhGHjAqA0bYymQ=; b=coOhicXu2NYhF+mIk0D+QOFi+ nMEFjO6NTU6eQ3GfXEjeMn6HDoE7QnzJdfFSZkMEPSO2DktOMUX/a/7Kw9nSAivZCKuBnz0TSzk+s LjFt54guWEYTdU3vS5Gsj1MWqOn15EeOo5Et+2IV2rD7vpITDV2ObHumuefXV8qR14w8I7HeeIp9A cfIjIKWNOpN6B632UyQkWAvwE+/kI8KY3ft8zK5tO5ovHDGWDkhBXd8O3vqO51rqMC8DLmxXF53ig fgKluFFjMzX9So7LGVh2ED7q1FISG5qRZJmobLBdwGW4nChjr31W7kQWbDBOINFGem0pSNc+TgmAG bhEVFYUhQ==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7D-00075a-GN; Fri, 02 Mar 2018 17:05:05 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 9C8AC209FB; Fri, 2 Mar 2018 18:04:43 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id BF1AD2091C; Fri, 2 Mar 2018 18:04:42 +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 46/52] mtd: rawnand: sm_common: convert driver to nand_scan() Date: Fri, 2 Mar 2018 18:03:54 +0100 Message-Id: <20180302170400.6712-47-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_120503_642506_17A10AE7 X-CRM114-Status: GOOD ( 14.88 ) 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/sm_common.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c index 71b791634ee4..895cc2e455e5 100644 --- a/drivers/mtd/nand/raw/sm_common.c +++ b/drivers/mtd/nand/raw/sm_common.c @@ -161,20 +161,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 */ - chip->flash_ids = smartmedia ? nand_smartmedia_flash_ids : - nand_xd_flash_ids; - ret = nand_scan_ident(mtd, 1, NULL); - - if (ret) - return ret; + struct mtd_info *mtd = nand_to_mtd(chip); /* Bad block marker position */ chip->badblockpos = 0x05; @@ -189,12 +178,29 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia) else return -ENODEV; - ret = nand_scan_tail(mtd); + return 0; +} +int sm_register_device(struct mtd_info *mtd, int smartmedia) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + int ret; + + chip->options |= NAND_SKIP_BBTSCAN; + + /* Scan for card properties */ + chip->flash_ids = smartmedia ? nand_smartmedia_flash_ids : + nand_xd_flash_ids; + chip->ecc.attach_chip = sm_attach_chip; + ret = nand_scan(mtd, 1); 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);