From patchwork Fri Mar 2 17:03:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255285 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 C8E9E6037F for ; Fri, 2 Mar 2018 17:36:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B44FA27852 for ; Fri, 2 Mar 2018 17:36:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A91242785D; Fri, 2 Mar 2018 17:36:05 +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 3AF1727852 for ; Fri, 2 Mar 2018 17:36:05 +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=0y3tsJkuVFH9ftiU7cC5arjF3d9EWXtzDepv1QbDuI4=; b=ttdqsRFzaQf5PvbgR8Zt1vD9cK aXyj080a+XH7Op0Gancw4AiljkxG142NUX2lnHs92Oq+aWCiCHTzQDE14c2gVkrpR9nPJ5PhH+jXy wFGppVuzjGwnNdSQXy31fOmoFKj7pO0nBfsciEe/LMqvydlCCJYv1lVT0y6WPC406K2S2nBpgg4I+ By23ygThB0XkK3atNn3fSH0p8FVLoPEwzHua/xqyG2o7IzSVwP/9VGghbzvjc2weqOLWHgAFpRZmG j9NjL9SoNUW6+sJKpwKlJhuqD99p735U8ML9S+RXKGn7i2k1z9a1MbSXQKiD8RFyoe7H4Lc+5lmkz I0xLcFiQ==; 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 1erob6-00063C-JR; Fri, 02 Mar 2018 17:35:56 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eroA7-0005sL-Fa; Fri, 02 Mar 2018 17:08:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=uZkzKx0Zi0n2wXcoRZV/QOrb8fYIVafZbBXkaNViqJY=; b=S+3tIB8dsCKI3+4CQuPqpxiWT mSCP81TtQwOWsJ3T4Zfu0o80hSw1ObiZRVUb4G5OL3KnTPkXO/sLOB31Jp60LRSsC4OtxknhF5Szz 3tJUdR7L4e50sdsbb/HL/+PZ/U5kRdd3ak+JJPNTNv1/++/ZZTBlf+dWYrCYkO5t2c0H3ZbhV2Zsj K3tA9CEOx+A0MQpQBa2WdRRYaHoUTT/hJyfsNqD2mmkK0waPwq0yxYH24DbOWqf1mX1Ub+KJjnz+e Jnmrcg0hYGmbkSBjiKCI3aRL4VzQrcYGX3aWb/GULH/4yGXFtGaHKN0XswSCXbMd67GRsM3fb9dVd SchNr6tKQ==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7D-0005ra-0C; Fri, 02 Mar 2018 17:05:04 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id DAE31209F5; Fri, 2 Mar 2018 18:04:42 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 0BD9C20379; 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 45/52] mtd: rawnand: sm_common: make use of the new flash_ids table entry Date: Fri, 2 Mar 2018 18:03:53 +0100 Message-Id: <20180302170400.6712-46-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_170503_053932_04EF8D6D X-CRM114-Status: GOOD ( 14.11 ) 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 Use the new entry in nand_chip to fill a local ID table instead of the traditional way through nand_scan_ident() as part of the transition to use nand_scan() in every driver. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/sm_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c index c378705c6e2b..71b791634ee4 100644 --- a/drivers/mtd/nand/raw/sm_common.c +++ b/drivers/mtd/nand/raw/sm_common.c @@ -169,8 +169,9 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia) chip->options |= NAND_SKIP_BBTSCAN; /* Scan for card properties */ - ret = nand_scan_ident(mtd, 1, smartmedia ? - nand_smartmedia_flash_ids : nand_xd_flash_ids); + chip->flash_ids = smartmedia ? nand_smartmedia_flash_ids : + nand_xd_flash_ids; + ret = nand_scan_ident(mtd, 1, NULL); if (ret) return ret;