{"id":949199,"url":"http://patchwork.ozlabs.org/api/1.2/patches/949199/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20180725133152.30898-6-miquel.raynal@bootlin.com/","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/1.2/projects/3/?format=json","name":"Linux MTD development","link_name":"linux-mtd","list_id":"linux-mtd.lists.infradead.org","list_email":"linux-mtd@lists.infradead.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20180725133152.30898-6-miquel.raynal@bootlin.com>","list_archive_url":null,"date":"2018-07-25T13:31:40","name":"[v5,05/17] mtd: rawnand: atmel: clarify NAND addition/removal paths","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d373712328ccc740f392a64eec13634a50809f24","submitter":{"id":73368,"url":"http://patchwork.ozlabs.org/api/1.2/people/73368/?format=json","name":"Miquel Raynal","email":"miquel.raynal@bootlin.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20180725133152.30898-6-miquel.raynal@bootlin.com/mbox/","series":[{"id":57526,"url":"http://patchwork.ozlabs.org/api/1.2/series/57526/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/list/?series=57526","date":"2018-07-25T13:31:36","name":"Allow dynamic allocations during NAND chip identification phase","version":5,"mbox":"http://patchwork.ozlabs.org/series/57526/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/949199/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/949199/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org\n\t(client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=bootlin.com","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"PZwEONUF\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[IPv6:2607:7c80:54:e::133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41bGcG64hXz9s29\n\tfor ;\n\tWed, 25 Jul 2018 23:42:06 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))\n\tid 1fiK3A-00084G-7e; Wed, 25 Jul 2018 13:41:56 +0000","from mail.bootlin.com ([62.4.15.54])\n\tby bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))\n\tid 1fiJu4-0000Kf-UD\n\tfor linux-mtd@lists.infradead.org; Wed, 25 Jul 2018 13:32:48 +0000","by mail.bootlin.com (Postfix, from userid 110)\n\tid 031EC20996; Wed, 25 Jul 2018 15:32:17 +0200 (CEST)","from localhost.localdomain\n\t(AAubervilliers-681-1-78-122.w90-88.abo.wanadoo.fr [90.88.20.122])\n\tby mail.bootlin.com (Postfix) with ESMTPSA id D3018207B3;\n\tWed, 25 Jul 2018 15:31:57 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:\n\tList-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:\n\tIn-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:\n\tContent-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc\n\t:Resent-Message-ID:List-Owner;\n\tbh=Sb8ilq3mZkwnQO86zS5BmpP4n9hLNqPdxtkCKpTzsfU=;\n\tb=PZwEONUF1pjvehUDmT/7O1Pliy\n\tshMfq4wYKEgXcRg7IETKRSW/Zpcpg0TYGUjM+hMda+edokh4sWR3pvmZRGm3NZD1HJLsm8atWM4mI\n\tCpk7nqTCoTBupqpcdu2EVsJKW5Q9GJEgS8q3kQ1aF5+ZQ0ljsRCUh2ZYyMMHb6hFxzqX83bsjutyr\n\tQCPI8BqLqe7iVB4wi/dga26otSy45NZMfZIU4YVKcJvUavKQvQnc3TBVaARZZd52UtClHDS26lydk\n\t3VeMzTG5oRWaLdp3a2C0If8hFGKq4WIkQv+p+tb4D+ecZtG21Dam8JIRtHk4EIh3p8veMcoynHeDd\n\tSirDFysg==;","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Miquel Raynal ","To":"Boris Brezillon ,\n\tRichard Weinberger ,\n\tDavid Woodhouse , \n\tBrian Norris ,\n\tMarek Vasut ","Subject":"[PATCH v5 05/17] mtd: rawnand: atmel: clarify NAND addition/removal\n\tpaths","Date":"Wed, 25 Jul 2018 15:31:40 +0200","Message-Id":"<20180725133152.30898-6-miquel.raynal@bootlin.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20180725133152.30898-1-miquel.raynal@bootlin.com>","References":"<20180725133152.30898-1-miquel.raynal@bootlin.com>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20180725_063233_876960_25073B93 ","X-CRM114-Status":"GOOD ( 19.74 )","X-Spam-Score":"-0.0 (/)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-0.0 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno trust [62.4.15.54 listed in list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lucas Stach , Wenyou Yang ,\n\tJosh Wu , Stefan Agner ,\n\tlinux-mtd@lists.infradead.org, Miquel Raynal ","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"No need for an atmel_nand_register() function, let's move the code in\nit directly where the function was called: in\natmel_nand_controller_add_nand(). Also, for more coherence, rename\natmel_nand_unregister() as atmel_nand_controller_remove_nand(), as\nopposed as the previously mentioned function.\n\nSigned-off-by: Miquel Raynal \n---\n drivers/mtd/nand/raw/atmel/nand-controller.c | 102 ++++++++++++---------------\n 1 file changed, 45 insertions(+), 57 deletions(-)","diff":"diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c\nindex 4d27401f1299..143d029710f0 100644\n--- a/drivers/mtd/nand/raw/atmel/nand-controller.c\n+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c\n@@ -1573,7 +1573,7 @@ static int atmel_nand_detect(struct atmel_nand *nand)\n \treturn ret;\n }\n \n-static int atmel_nand_unregister(struct atmel_nand *nand)\n+static int atmel_nand_controller_remove_nand(struct atmel_nand *nand)\n {\n \tstruct nand_chip *chip = &nand->base;\n \tstruct mtd_info *mtd = nand_to_mtd(chip);\n@@ -1589,60 +1589,6 @@ static int atmel_nand_unregister(struct atmel_nand *nand)\n \treturn 0;\n }\n \n-static int atmel_nand_register(struct atmel_nand *nand)\n-{\n-\tstruct nand_chip *chip = &nand->base;\n-\tstruct mtd_info *mtd = nand_to_mtd(chip);\n-\tstruct atmel_nand_controller *nc;\n-\tint ret;\n-\n-\tnc = to_nand_controller(chip->controller);\n-\n-\tif (nc->caps->legacy_of_bindings || !nc->dev->of_node) {\n-\t\t/*\n-\t\t * We keep the MTD name unchanged to avoid breaking platforms\n-\t\t * where the MTD cmdline parser is used and the bootloader\n-\t\t * has not been updated to use the new naming scheme.\n-\t\t */\n-\t\tmtd->name = \"atmel_nand\";\n-\t} else if (!mtd->name) {\n-\t\t/*\n-\t\t * If the new bindings are used and the bootloader has not been\n-\t\t * updated to pass a new mtdparts parameter on the cmdline, you\n-\t\t * should define the following property in your nand node:\n-\t\t *\n-\t\t *\tlabel = \"atmel_nand\";\n-\t\t *\n-\t\t * This way, mtd->name will be set by the core when\n-\t\t * nand_set_flash_node() is called.\n-\t\t */\n-\t\tmtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,\n-\t\t\t\t\t \"%s:nand.%d\", dev_name(nc->dev),\n-\t\t\t\t\t nand->cs[0].id);\n-\t\tif (!mtd->name) {\n-\t\t\tdev_err(nc->dev, \"Failed to allocate mtd->name\\n\");\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\t}\n-\n-\tret = nand_scan_tail(mtd);\n-\tif (ret) {\n-\t\tdev_err(nc->dev, \"nand_scan_tail() failed: %d\\n\", ret);\n-\t\treturn ret;\n-\t}\n-\n-\tret = mtd_device_register(mtd, NULL, 0);\n-\tif (ret) {\n-\t\tdev_err(nc->dev, \"Failed to register mtd device: %d\\n\", ret);\n-\t\tnand_cleanup(chip);\n-\t\treturn ret;\n-\t}\n-\n-\tlist_add_tail(&nand->node, &nc->chips);\n-\n-\treturn 0;\n-}\n-\n static struct atmel_nand *atmel_nand_create(struct atmel_nand_controller *nc,\n \t\t\t\t\t struct device_node *np,\n \t\t\t\t\t int reg_cells)\n@@ -1772,7 +1718,49 @@ atmel_nand_controller_add_nand(struct atmel_nand_controller *nc,\n \tif (ret)\n \t\treturn ret;\n \n-\treturn atmel_nand_register(nand);\n+\tif (nc->caps->legacy_of_bindings || !nc->dev->of_node) {\n+\t\t/*\n+\t\t * We keep the MTD name unchanged to avoid breaking platforms\n+\t\t * where the MTD cmdline parser is used and the bootloader\n+\t\t * has not been updated to use the new naming scheme.\n+\t\t */\n+\t\tmtd->name = \"atmel_nand\";\n+\t} else if (!mtd->name) {\n+\t\t/*\n+\t\t * If the new bindings are used and the bootloader has not been\n+\t\t * updated to pass a new mtdparts parameter on the cmdline, you\n+\t\t * should define the following property in your nand node:\n+\t\t *\n+\t\t *\tlabel = \"atmel_nand\";\n+\t\t *\n+\t\t * This way, mtd->name will be set by the core when\n+\t\t * nand_set_flash_node() is called.\n+\t\t */\n+\t\tmtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,\n+\t\t\t\t\t \"%s:nand.%d\", dev_name(nc->dev),\n+\t\t\t\t\t nand->cs[0].id);\n+\t\tif (!mtd->name) {\n+\t\t\tdev_err(nc->dev, \"Failed to allocate mtd->name\\n\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n+\n+\tret = nand_scan_tail(mtd);\n+\tif (ret) {\n+\t\tdev_err(nc->dev, \"nand_scan_tail() failed: %d\\n\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\tret = mtd_device_register(mtd, NULL, 0);\n+\tif (ret) {\n+\t\tdev_err(nc->dev, \"Failed to register mtd device: %d\\n\", ret);\n+\t\tnand_cleanup(chip);\n+\t\treturn ret;\n+\t}\n+\n+\tlist_add_tail(&nand->node, &nc->chips);\n+\n+\treturn 0;\n }\n \n static int\n@@ -1782,7 +1770,7 @@ atmel_nand_controller_remove_nands(struct atmel_nand_controller *nc)\n \tint ret;\n \n \tlist_for_each_entry_safe(nand, tmp, &nc->chips, node) {\n-\t\tret = atmel_nand_unregister(nand);\n+\t\tret = atmel_nand_controller_remove_nand(nand);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n","prefixes":["v5","05/17"]}