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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 C926EC10F13 for ; Sun, 14 Apr 2019 08:44:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 992A32148E for ; Sun, 14 Apr 2019 08:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726305AbfDNIoj (ORCPT ); Sun, 14 Apr 2019 04:44:39 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:40882 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725786AbfDNIoj (ORCPT ); Sun, 14 Apr 2019 04:44:39 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 16F04263959; Sun, 14 Apr 2019 09:44:37 +0100 (BST) Date: Sun, 14 Apr 2019 10:44:34 +0200 From: Boris Brezillon To: Richard Weinberger Cc: linux-mtd@lists.infradead.org, bbrezillon@kernel.org, linux-kernel@vger.kernel.org, marek.vasut@gmail.com, miquel.raynal@bootlin.com, computersforpeace@gmail.com, dwmw2@infradead.org Subject: Re: [PATCH 1/2] mtd: nandsim: Embed struct nand_chip in struct nandsim Message-ID: <20190414104434.148dfa50@collabora.com> In-Reply-To: <20190413084052.15416-1-richard@nod.at> References: <20190413084052.15416-1-richard@nod.at> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 13 Apr 2019 10:40:51 +0200 Richard Weinberger wrote: > We well need struct nand_controller soon, so more stuff need to > be parts of struct nandsim. > While we are here, rename "nand" to "ns" to use the same naming scheme > everywhere in nandsim. > > Signed-off-by: Richard Weinberger Reviewed-by: Boris Brezillon > --- > drivers/mtd/nand/raw/nandsim.c | 49 +++++++++++++++++----------------- > 1 file changed, 24 insertions(+), 25 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nandsim.c b/drivers/mtd/nand/raw/nandsim.c > index 933d1a629c51..3d80e2d23b6e 100644 > --- a/drivers/mtd/nand/raw/nandsim.c > +++ b/drivers/mtd/nand/raw/nandsim.c > @@ -298,6 +298,7 @@ union ns_mem { > * The structure which describes all the internal simulator data. > */ > struct nandsim { > + struct nand_chip chip; > struct mtd_partition partitions[CONFIG_NANDSIM_MAX_PARTS]; > unsigned int nbparts; > > @@ -2216,7 +2217,7 @@ static const struct nand_controller_ops ns_controller_ops = { > static int __init ns_init_module(void) > { > struct nand_chip *chip; > - struct nandsim *nand; > + struct nandsim *ns; > int retval = -ENOMEM, i; > > if (bus_width != 8 && bus_width != 16) { > @@ -2224,16 +2225,14 @@ static int __init ns_init_module(void) > return -EINVAL; > } > > - /* Allocate and initialize mtd_info, nand_chip and nandsim structures */ > - chip = kzalloc(sizeof(struct nand_chip) + sizeof(struct nandsim), > - GFP_KERNEL); > - if (!chip) { > + ns = kzalloc(sizeof(struct nandsim), GFP_KERNEL); > + if (!ns) { > NS_ERR("unable to allocate core structures.\n"); > return -ENOMEM; > } > + chip = &ns->chip; > nsmtd = nand_to_mtd(chip); > - nand = (struct nandsim *)(chip + 1); > - nand_set_controller_data(chip, (void *)nand); > + nand_set_controller_data(chip, (void *)ns); > > /* > * Register simulator's callbacks. > @@ -2266,19 +2265,19 @@ static int __init ns_init_module(void) > * the initial ID read command correctly > */ > if (id_bytes[6] != 0xFF || id_bytes[7] != 0xFF) > - nand->geom.idbytes = 8; > + ns->geom.idbytes = 8; > else if (id_bytes[4] != 0xFF || id_bytes[5] != 0xFF) > - nand->geom.idbytes = 6; > + ns->geom.idbytes = 6; > else if (id_bytes[2] != 0xFF || id_bytes[3] != 0xFF) > - nand->geom.idbytes = 4; > + ns->geom.idbytes = 4; > else > - nand->geom.idbytes = 2; > - nand->regs.status = NS_STATUS_OK(nand); > - nand->nxstate = STATE_UNKNOWN; > - nand->options |= OPT_PAGE512; /* temporary value */ > - memcpy(nand->ids, id_bytes, sizeof(nand->ids)); > + ns->geom.idbytes = 2; > + ns->regs.status = NS_STATUS_OK(ns); > + ns->nxstate = STATE_UNKNOWN; > + ns->options |= OPT_PAGE512; /* temporary value */ > + memcpy(ns->ids, id_bytes, sizeof(ns->ids)); > if (bus_width == 16) { > - nand->busw = 16; > + ns->busw = 16; > chip->options |= NAND_BUSWIDTH_16; > } > > @@ -2323,27 +2322,27 @@ static int __init ns_init_module(void) > if ((retval = nand_create_bbt(chip)) != 0) > goto err_exit; > > - if ((retval = parse_badblocks(nand, nsmtd)) != 0) > + if ((retval = parse_badblocks(ns, nsmtd)) != 0) > goto err_exit; > > /* Register NAND partitions */ > - retval = mtd_device_register(nsmtd, &nand->partitions[0], > - nand->nbparts); > + retval = mtd_device_register(nsmtd, &ns->partitions[0], > + ns->nbparts); > if (retval != 0) > goto err_exit; > > - if ((retval = nandsim_debugfs_create(nand)) != 0) > + if ((retval = nandsim_debugfs_create(ns)) != 0) > goto err_exit; > > return 0; > > err_exit: > - free_nandsim(nand); > + free_nandsim(ns); > nand_release(chip); > - for (i = 0;i < ARRAY_SIZE(nand->partitions); ++i) > - kfree(nand->partitions[i].name); > + for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i) > + kfree(ns->partitions[i].name); > error: > - kfree(chip); > + kfree(ns); > free_lists(); > > return retval; > @@ -2364,7 +2363,7 @@ static void __exit ns_cleanup_module(void) > nand_release(chip); /* Unregister driver */ > for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i) > kfree(ns->partitions[i].name); > - kfree(mtd_to_nand(nsmtd)); /* Free other structures */ > + kfree(ns); /* Free other structures */ > free_lists(); > } >