From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aHGMO-000599-CD for linux-mtd@lists.infradead.org; Thu, 07 Jan 2016 19:36:37 +0000 Date: Thu, 7 Jan 2016 20:36:14 +0100 From: Boris Brezillon To: Brian Norris Cc: Subject: Re: [PATCH] mtd: nandsim: use nand_get_controller_data() Message-ID: <20160107203614.731f760b@bbrezillon> In-Reply-To: <1452193606-96031-1-git-send-email-computersforpeace@gmail.com> References: <1452193606-96031-1-git-send-email-computersforpeace@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 7 Jan 2016 11:06:46 -0800 Brian Norris wrote: > Commit d699ed250c07 ("mtd: nand: make use of > nand_set/get_controller_data() helpers") overlooked some uses of > nand_chip::priv. Oops. Apparently my coccinelle script is not detecting those mtd_to_nand(mtd)->priv statements. Reviewed-by: Boris Brezillon Thanks, Boris > > Signed-off-by: Brian Norris > --- > drivers/mtd/nand/nandsim.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c > index f57f461b5d72..1fd519503bb1 100644 > --- a/drivers/mtd/nand/nandsim.c > +++ b/drivers/mtd/nand/nandsim.c > @@ -1908,7 +1908,8 @@ static void switch_state(struct nandsim *ns) > > static u_char ns_nand_read_byte(struct mtd_info *mtd) > { > - struct nandsim *ns = mtd_to_nand(mtd)->priv; > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nandsim *ns = nand_get_controller_data(chip); > u_char outb = 0x00; > > /* Sanity and correctness checks */ > @@ -1969,7 +1970,8 @@ static u_char ns_nand_read_byte(struct mtd_info *mtd) > > static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte) > { > - struct nandsim *ns = mtd_to_nand(mtd)->priv; > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nandsim *ns = nand_get_controller_data(chip); > > /* Sanity and correctness checks */ > if (!ns->lines.ce) { > @@ -2123,7 +2125,8 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte) > > static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask) > { > - struct nandsim *ns = mtd_to_nand(mtd)->priv; > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nandsim *ns = nand_get_controller_data(chip); > > ns->lines.cle = bitmask & NAND_CLE ? 1 : 0; > ns->lines.ale = bitmask & NAND_ALE ? 1 : 0; > @@ -2150,7 +2153,8 @@ static uint16_t ns_nand_read_word(struct mtd_info *mtd) > > static void ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) > { > - struct nandsim *ns = mtd_to_nand(mtd)->priv; > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nandsim *ns = nand_get_controller_data(chip); > > /* Check that chip is expecting data input */ > if (!(ns->state & STATE_DATAIN_MASK)) { > @@ -2177,7 +2181,8 @@ static void ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) > > static void ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) > { > - struct nandsim *ns = mtd_to_nand(mtd)->priv; > + struct nand_chip *chip = mtd_to_nand(mtd); > + struct nandsim *ns = nand_get_controller_data(chip); > > /* Sanity and correctness checks */ > if (!ns->lines.ce) { > @@ -2404,7 +2409,8 @@ module_init(ns_init_module); > */ > static void __exit ns_cleanup_module(void) > { > - struct nandsim *ns = mtd_to_nand(nsmtd)->priv; > + struct nand_chip *chip = mtd_to_nand(nsmtd); > + struct nandsim *ns = nand_get_controller_data(chip); > int i; > > nandsim_debugfs_remove(ns); -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com