]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mtd: rawnand: Convert to using %pOFn instead of device_node.name
authorRob Herring <robh@kernel.org>
Tue, 28 Aug 2018 01:52:34 +0000 (20:52 -0500)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 4 Sep 2018 21:37:38 +0000 (23:37 +0200)
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Boris Brezillon <boris.brezillon@bootlin.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/nand/raw/fsl_upm.c
drivers/mtd/nand/raw/ndfc.c

index a88e2cf66e0f69a0d5d94ea4d1340701c82884ec..ca82727eca944ed4011e05eb2e31d976581c9fe4 100644 (file)
@@ -184,8 +184,8 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
                return -ENODEV;
 
        nand_set_flash_node(&fun->chip, flash_np);
-       mtd->name = kasprintf(GFP_KERNEL, "0x%llx.%s", (u64)io_res->start,
-                             flash_np->name);
+       mtd->name = kasprintf(GFP_KERNEL, "0x%llx.%pOFn", (u64)io_res->start,
+                             flash_np);
        if (!mtd->name) {
                ret = -ENOMEM;
                goto err;
index 540fa1a0ea24ec5605231bb2946cd782c71fab1b..b193f373f235b08a71b88a053effb040a8622542 100644 (file)
@@ -174,8 +174,8 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
                return -ENODEV;
        nand_set_flash_node(chip, flash_np);
 
-       mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev),
-                             flash_np->name);
+       mtd->name = kasprintf(GFP_KERNEL, "%s.%pOFn", dev_name(&ndfc->ofdev->dev),
+                             flash_np);
        if (!mtd->name) {
                ret = -ENOMEM;
                goto err;