| Message ID | 20180828015252.28511-33-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | a9fdba0b0e5f63646fdf65e0e01dd757b11cec83 |
| Headers | show |
| Series | mtd: rawnand: Convert to using %pOFn instead of device_node.name | expand |
On Mon, 27 Aug 2018 20:52:34 -0500 Rob Herring <robh@kernel.org> wrote: > 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> > --- > drivers/mtd/nand/raw/fsl_upm.c | 4 ++-- > drivers/mtd/nand/raw/ndfc.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c > index a88e2cf66e0f..ca82727eca94 100644 > --- a/drivers/mtd/nand/raw/fsl_upm.c > +++ b/drivers/mtd/nand/raw/fsl_upm.c > @@ -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; > diff --git a/drivers/mtd/nand/raw/ndfc.c b/drivers/mtd/nand/raw/ndfc.c > index 540fa1a0ea24..b193f373f235 100644 > --- a/drivers/mtd/nand/raw/ndfc.c > +++ b/drivers/mtd/nand/raw/ndfc.c > @@ -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;
Hi Rob, Rob Herring <robh@kernel.org> wrote on Mon, 27 Aug 2018 20:52:34 -0500: > 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> > --- Applied to nand/next. Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c index a88e2cf66e0f..ca82727eca94 100644 --- a/drivers/mtd/nand/raw/fsl_upm.c +++ b/drivers/mtd/nand/raw/fsl_upm.c @@ -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; diff --git a/drivers/mtd/nand/raw/ndfc.c b/drivers/mtd/nand/raw/ndfc.c index 540fa1a0ea24..b193f373f235 100644 --- a/drivers/mtd/nand/raw/ndfc.c +++ b/drivers/mtd/nand/raw/ndfc.c @@ -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;
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> --- drivers/mtd/nand/raw/fsl_upm.c | 4 ++-- drivers/mtd/nand/raw/ndfc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1