diff mbox series

ARM: omap: Convert to using %pOFn instead of device_node.name

Message ID 20180828015252.28511-1-robh@kernel.org
State Superseded
Headers show
Series ARM: omap: Convert to using %pOFn instead of device_node.name | expand

Commit Message

Rob Herring (Arm) Aug. 28, 2018, 1:52 a.m. UTC 
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>

---
 arch/arm/mach-omap2/omap_hwmod.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

-- 
2.17.1

Comments

Joe Perches Aug. 28, 2018, 6:55 a.m. UTC | #1 
On Mon, 2018-08-27 at 20:52 -0500, Rob Herring wrote:
> In preparation to remove the node name pointer from struct device_node,

> convert printf users to use the %pOFn format specifier.

[]
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c

[]
> @@ -738,7 +738,7 @@ static int __init _setup_clkctrl_provider(struct device_node *np)

>  	provider->size = size | 0xff;

>  	provider->node = np;

>  

> -	pr_debug("%s: %s: %x...%x [+%x]\n", __func__, np->parent->name,

> +	pr_debug("%pOF: %s: %x...%x [+%x]\n", __func__, np->parent,


Wrong argument order

I didn't look at the rest.
Sean Wang Aug. 29, 2018, 2:13 a.m. UTC | #2 
On Mon, 2018-08-27 at 20:52 -0500, Rob Herring wrote:
> In preparation to remove the node name pointer from struct device_node,

> convert printf users to use the %pOFn format specifier.

> 

> Cc: Linus Walleij <linus.walleij@linaro.org>

> Cc: Dong Aisheng <aisheng.dong@nxp.com>

> Cc: Fabio Estevam <festevam@gmail.com>

> Cc: Shawn Guo <shawnguo@kernel.org>

> Cc: Stefan Agner <stefan@agner.ch>

> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>

> Cc: Sean Wang <sean.wang@mediatek.com>

> Cc: Matthias Brugger <matthias.bgg@gmail.com>

> Cc: Carlo Caione <carlo@caione.org>

> Cc: Kevin Hilman <khilman@baylibre.com>

> Cc: Jason Cooper <jason@lakedaemon.net>

> Cc: Andrew Lunn <andrew@lunn.ch>

> Cc: Gregory Clement <gregory.clement@bootlin.com>

> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>

> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

> Cc: Heiko Stuebner <heiko@sntech.de>

> Cc: Tony Lindgren <tony@atomide.com>

> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>

> Cc: Patrice Chotard <patrice.chotard@st.com>

> Cc: Barry Song <baohua@kernel.org>

> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>

> Cc: Alexandre Torgue <alexandre.torgue@st.com>

> Cc: Maxime Ripard <maxime.ripard@bootlin.com>

> Cc: Chen-Yu Tsai <wens@csie.org>

> Cc: linux-gpio@vger.kernel.org

> Cc: linux-mediatek@lists.infradead.org

> Cc: linux-arm-kernel@lists.infradead.org

> Cc: linux-amlogic@lists.infradead.org

> Cc: linux-rockchip@lists.infradead.org

> Cc: linux-omap@vger.kernel.org

> Signed-off-by: Rob Herring <robh@kernel.org>

> ---

>  drivers/pinctrl/berlin/berlin.c               |  6 ++--

>  drivers/pinctrl/freescale/pinctrl-imx.c       |  7 ++--

>  drivers/pinctrl/freescale/pinctrl-imx1-core.c | 12 +++----

>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |  4 +--


For mediatek,
Acked-by: Sean Wang <sean.wang@mediatek.com>
Chen-Yu Tsai Aug. 29, 2018, 2:15 a.m. UTC | #3 
On Tue, Aug 28, 2018 at 9:55 AM 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: Linus Walleij <linus.walleij@linaro.org>

> Cc: Dong Aisheng <aisheng.dong@nxp.com>

> Cc: Fabio Estevam <festevam@gmail.com>

> Cc: Shawn Guo <shawnguo@kernel.org>

> Cc: Stefan Agner <stefan@agner.ch>

> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>

> Cc: Sean Wang <sean.wang@mediatek.com>

> Cc: Matthias Brugger <matthias.bgg@gmail.com>

> Cc: Carlo Caione <carlo@caione.org>

> Cc: Kevin Hilman <khilman@baylibre.com>

> Cc: Jason Cooper <jason@lakedaemon.net>

> Cc: Andrew Lunn <andrew@lunn.ch>

> Cc: Gregory Clement <gregory.clement@bootlin.com>

> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>

> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

> Cc: Heiko Stuebner <heiko@sntech.de>

> Cc: Tony Lindgren <tony@atomide.com>

> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>

> Cc: Patrice Chotard <patrice.chotard@st.com>

> Cc: Barry Song <baohua@kernel.org>

> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>

> Cc: Alexandre Torgue <alexandre.torgue@st.com>

> Cc: Maxime Ripard <maxime.ripard@bootlin.com>

> Cc: Chen-Yu Tsai <wens@csie.org>

> Cc: linux-gpio@vger.kernel.org

> Cc: linux-mediatek@lists.infradead.org

> Cc: linux-arm-kernel@lists.infradead.org

> Cc: linux-amlogic@lists.infradead.org

> Cc: linux-rockchip@lists.infradead.org

> Cc: linux-omap@vger.kernel.org

> Signed-off-by: Rob Herring <robh@kernel.org>

> ---

>  drivers/pinctrl/berlin/berlin.c               |  6 ++--

>  drivers/pinctrl/freescale/pinctrl-imx.c       |  7 ++--

>  drivers/pinctrl/freescale/pinctrl-imx1-core.c | 12 +++----

>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |  4 +--

>  drivers/pinctrl/meson/pinctrl-meson.c         |  2 +-

>  drivers/pinctrl/mvebu/pinctrl-mvebu.c         |  4 +--

>  drivers/pinctrl/nomadik/pinctrl-nomadik.c     |  6 ++--

>  drivers/pinctrl/pinctrl-at91.c                |  8 ++---

>  drivers/pinctrl/pinctrl-lantiq.c              |  8 ++---

>  drivers/pinctrl/pinctrl-rockchip.c            |  8 ++---

>  drivers/pinctrl/pinctrl-rza1.c                |  8 ++---

>  drivers/pinctrl/pinctrl-single.c              | 32 +++++++++----------

>  drivers/pinctrl/pinctrl-st.c                  |  6 ++--

>  drivers/pinctrl/sirf/pinctrl-atlas7.c         |  4 +--

>  drivers/pinctrl/stm32/pinctrl-stm32.c         |  4 +--

>  drivers/pinctrl/sunxi/pinctrl-sunxi.c         |  8 ++---


For sunxi:

Acked-by: Chen-Yu Tsai <wens@csie.org>
Linus Walleij Aug. 29, 2018, 12:07 p.m. UTC | #4 
On Tue, Aug 28, 2018 at 3:55 AM 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: Linus Walleij <linus.walleij@linaro.org>


Patch applied along with the thundering hoard of ACKs.

Yours,
Linus Walleij
Chen-Yu Tsai Sept. 3, 2018, 5:29 a.m. UTC | #5 
On Tue, Aug 28, 2018 at 9:53 AM 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: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>

> Cc: Michael Turquette <mturquette@baylibre.com>

> Cc: Stephen Boyd <sboyd@kernel.org>

> Cc: linux-clk@vger.kernel.org

> Cc: linux-arm-kernel@lists.infradead.org

> Cc: linux-renesas-soc@vger.kernel.org

> Cc: linux-omap@vger.kernel.org

> Signed-off-by: Rob Herring <robh@kernel.org>

> ---


>  drivers/clk/sunxi/clk-mod0.c        |  6 +++---

>  drivers/clk/sunxi/clk-sun9i-core.c  | 20 ++++++++++----------

>  drivers/clk/sunxi/clk-sunxi.c       |  4 ++--


For the sunxi bits,

Acked-by: Chen-Yu Tsai <wens@csie.org>
Rob Herring (Arm) Sept. 7, 2018, 3:08 p.m. UTC | #6 
On Mon, Aug 27, 2018 at 8:53 PM 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.



> @@ -492,8 +492,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)

>

>         provider->base = of_iomap(node, 0);

>

> -       provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3,

> -                                      GFP_KERNEL);

> +       provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFnxxx", node->parent);


Turns out xxx was a bad choice as the %p handler eats all alphanumeric
characters. Looks like this has already been applied, so I will send a
fix.

Rob
diff mbox series

Patch

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 2ceffd85dd3d..b5757646355a 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -738,7 +738,7 @@  static int __init _setup_clkctrl_provider(struct device_node *np)
 	provider->size = size | 0xff;
 	provider->node = np;
 
-	pr_debug("%s: %s: %x...%x [+%x]\n", __func__, np->parent->name,
+	pr_debug("%pOF: %s: %x...%x [+%x]\n", __func__, np->parent,
 		 provider->addr, provider->addr + provider->size,
 		 provider->offset);
 
@@ -799,9 +799,9 @@  static struct clk *_lookup_clkctrl_clk(struct omap_hwmod *oh)
 
 			clk = of_clk_get_from_provider(&clkspec);
 
-			pr_debug("%s: %s got %p (offset=%x, provider=%s)\n",
+			pr_debug("%s: %s got %p (offset=%x, provider=%pOFn)\n",
 				 __func__, oh->name, clk, clkspec.args[0],
-				 provider->node->parent->name);
+				 provider->node->parent);
 
 			return clk;
 		}
@@ -2107,8 +2107,8 @@  static int of_dev_find_hwmod(struct device_node *np,
 		if (res)
 			continue;
 		if (!strcmp(p, oh->name)) {
-			pr_debug("omap_hwmod: dt %s[%i] uses hwmod %s\n",
-				 np->name, i, oh->name);
+			pr_debug("omap_hwmod: dt %pOFn[%i] uses hwmod %s\n",
+				 np, i, oh->name);
 			return i;
 		}
 	}
@@ -2210,8 +2210,8 @@  int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
 		return -ENOENT;
 
 	if (nr_addr != 1 || nr_size != 1) {
-		pr_err("%s: invalid range for %s->%s\n", __func__,
-		       oh->name, np->name);
+		pr_err("%s: invalid range for %s->%pOFn\n", __func__,
+		       oh->name, np);
 		return -EINVAL;
 	}
 
@@ -2219,8 +2219,8 @@  int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
 	base = of_translate_address(np, ranges++);
 	size = be32_to_cpup(ranges);
 
-	pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n",
-		 oh->name, np->name, base, size);
+	pr_debug("omap_hwmod: %s %pOFn at 0x%llx size 0x%llx\n",
+		 oh->name, np, base, size);
 
 	res->start = base;
 	res->end = base + size - 1;
@@ -2322,8 +2322,8 @@  static int __init _init(struct omap_hwmod *oh, void *data)
 	if (r)
 		pr_debug("omap_hwmod: %s missing dt data\n", oh->name);
 	else if (np && index)
-		pr_warn("omap_hwmod: %s using broken dt data from %s\n",
-			oh->name, np->name);
+		pr_warn("omap_hwmod: %s using broken dt data from %pOFn\n",
+			oh->name, np);
 
 	r = _init_mpu_rt_base(oh, NULL, index, np);
 	if (r < 0) {