[PATCH] ARM: Convert to using %pOF instead of full_name
Gregory CLEMENT
gregory.clement at free-electrons.com
Wed Jul 19 04:43:57 PDT 2017
Hi Rob,
On mar., juil. 18 2017, Rob Herring <robh at kernel.org> wrote:
> Now that we have a custom printf format specifier, convert users of
> full_name to use %pOF instead. This is preparation to remove storing
> of the full path string for each node.
>
> Signed-off-by: Rob Herring <robh at kernel.org>
> Cc: Russell King <linux at armlinux.org.uk>
> Cc: Kukjin Kim <kgene at kernel.org>
> Cc: Krzysztof Kozlowski <krzk at kernel.org>
> Cc: Javier Martinez Canillas <javier at osg.samsung.com>
> Cc: Shawn Guo <shawnguo at kernel.org>
> Cc: Sascha Hauer <kernel at pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam at nxp.com>
> Cc: Jason Cooper <jason at lakedaemon.net>
> Cc: Andrew Lunn <andrew at lunn.ch>
> Cc: Gregory Clement <gregory.clement at free-electrons.com>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
> Cc: Tony Lindgren <tony at atomide.com>
> Cc: "Benoît Cousson" <bcousson at baylibre.com>
> Cc: Paul Walmsley <paul at pwsan.com>
> Cc: Heiko Stuebner <heiko at sntech.de>
> Cc: Simon Horman <horms at verge.net.au>
> Cc: Magnus Damm <magnus.damm at gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-samsung-soc at vger.kernel.org
> Cc: linux-omap at vger.kernel.org
> Cc: linux-rockchip at lists.infradead.org
> Cc: linux-renesas-soc at vger.kernel.org
> ---
> arch/arm/kernel/cpuidle.c | 4 ++--
> arch/arm/kernel/devtree.c | 6 +++---
> arch/arm/kernel/topology.c | 4 ++--
> arch/arm/mach-exynos/suspend.c | 8 ++++----
> arch/arm/mach-imx/gpc.c | 4 ++--
> arch/arm/mach-mvebu/kirkwood.c | 4 ++--
For the krkwood part
Acked-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
Thanks,
Gregory
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++--
> arch/arm/mach-omap2/omap_hwmod.c | 4 ++--
> arch/arm/mach-rockchip/platsmp.c | 4 ++--
> arch/arm/mach-shmobile/pm-rmobile.c | 8 ++++----
> 10 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
> index a3308ad1a024..fda5579123a8 100644
> --- a/arch/arm/kernel/cpuidle.c
> +++ b/arch/arm/kernel/cpuidle.c
> @@ -101,8 +101,8 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
>
> ops = arm_cpuidle_get_ops(enable_method);
> if (!ops) {
> - pr_warn("%s: unsupported enable-method property: %s\n",
> - dn->full_name, enable_method);
> + pr_warn("%pOF: unsupported enable-method property: %s\n",
> + dn, enable_method);
> return -EOPNOTSUPP;
> }
>
> diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
> index f676febbb270..28174c9a94ac 100644
> --- a/arch/arm/kernel/devtree.c
> +++ b/arch/arm/kernel/devtree.c
> @@ -95,7 +95,7 @@ void __init arm_dt_init_cpu_maps(void)
> if (of_node_cmp(cpu->type, "cpu"))
> continue;
>
> - pr_debug(" * %s...\n", cpu->full_name);
> + pr_debug(" * %pOF...\n", cpu);
> /*
> * A device tree containing CPU nodes with missing "reg"
> * properties is considered invalid to build the
> @@ -103,8 +103,8 @@ void __init arm_dt_init_cpu_maps(void)
> */
> cell = of_get_property(cpu, "reg", &prop_bytes);
> if (!cell || prop_bytes < sizeof(*cell)) {
> - pr_debug(" * %s missing reg property\n",
> - cpu->full_name);
> + pr_debug(" * %pOF missing reg property\n",
> + cpu);
> of_node_put(cpu);
> return;
> }
> diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
> index bf949a763dbe..e596c5b8f931 100644
> --- a/arch/arm/kernel/topology.c
> +++ b/arch/arm/kernel/topology.c
> @@ -127,8 +127,8 @@ static void __init parse_dt_topology(void)
>
> rate = of_get_property(cn, "clock-frequency", &len);
> if (!rate || len != 4) {
> - pr_err("%s missing clock-frequency property\n",
> - cn->full_name);
> + pr_err("%pOF missing clock-frequency property\n",
> + cn);
> continue;
> }
>
> diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
> index 748cfb8d5212..3c7b66c22697 100644
> --- a/arch/arm/mach-exynos/suspend.c
> +++ b/arch/arm/mach-exynos/suspend.c
> @@ -187,21 +187,21 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
> struct irq_domain *parent_domain, *domain;
>
> if (!parent) {
> - pr_err("%s: no parent, giving up\n", node->full_name);
> + pr_err("%pOF: no parent, giving up\n", node);
> return -ENODEV;
> }
>
> parent_domain = irq_find_host(parent);
> if (!parent_domain) {
> - pr_err("%s: unable to obtain parent domain\n", node->full_name);
> + pr_err("%pOF: unable to obtain parent domain\n", node);
> return -ENXIO;
> }
>
> pmu_base_addr = of_iomap(node, 0);
>
> if (!pmu_base_addr) {
> - pr_err("%s: failed to find exynos pmu register\n",
> - node->full_name);
> + pr_err("%pOF: failed to find exynos pmu register\n",
> + node);
> return -ENOMEM;
> }
>
> diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
> index 93f584ba0130..de535cb679b3 100644
> --- a/arch/arm/mach-imx/gpc.c
> +++ b/arch/arm/mach-imx/gpc.c
> @@ -224,13 +224,13 @@ static int __init imx_gpc_init(struct device_node *node,
> int i;
>
> if (!parent) {
> - pr_err("%s: no parent, giving up\n", node->full_name);
> + pr_err("%pOF: no parent, giving up\n", node);
> return -ENODEV;
> }
>
> parent_domain = irq_find_host(parent);
> if (!parent_domain) {
> - pr_err("%s: unable to obtain parent domain\n", node->full_name);
> + pr_err("%pOF: unable to obtain parent domain\n", node);
> return -ENXIO;
> }
>
> diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
> index 7d9f2fd9e450..419da435bc94 100644
> --- a/arch/arm/mach-mvebu/kirkwood.c
> +++ b/arch/arm/mach-mvebu/kirkwood.c
> @@ -107,8 +107,8 @@ static void __init kirkwood_dt_eth_fixup(void)
> clk_prepare_enable(clk);
>
> /* store MAC address register contents in local-mac-address */
> - pr_err(FW_INFO "%s: local-mac-address is not set\n",
> - np->full_name);
> + pr_err(FW_INFO "%pOF: local-mac-address is not set\n",
> + np);
>
> pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
> if (!pmac)
> diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
> index 33ed5d53fa45..4bb6751864a5 100644
> --- a/arch/arm/mach-omap2/omap-wakeupgen.c
> +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
> @@ -522,13 +522,13 @@ static int __init wakeupgen_init(struct device_node *node,
> u32 val;
>
> if (!parent) {
> - pr_err("%s: no parent, giving up\n", node->full_name);
> + pr_err("%pOF: no parent, giving up\n", node);
> return -ENODEV;
> }
>
> parent_domain = irq_find_host(parent);
> if (!parent_domain) {
> - pr_err("%s: unable to obtain parent domain\n", node->full_name);
> + pr_err("%pOF: unable to obtain parent domain\n", node);
> return -ENXIO;
> }
> /* Not supported on OMAP4 ES1.0 silicon */
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 3b47ded5fa0c..2dbd63239c54 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -2417,8 +2417,8 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
> if (mem)
> pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
> else
> - pr_err("omap_hwmod: %s: Missing dt reg%i for %s\n",
> - oh->name, index, np->full_name);
> + pr_err("omap_hwmod: %s: Missing dt reg%i for %pOF\n",
> + oh->name, index, np);
> return -ENXIO;
> }
>
> diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
> index 3abafdbdd7f4..2b5b0e43d657 100644
> --- a/arch/arm/mach-rockchip/platsmp.c
> +++ b/arch/arm/mach-rockchip/platsmp.c
> @@ -182,8 +182,8 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node)
>
> ret = of_address_to_resource(node, 0, &res);
> if (ret < 0) {
> - pr_err("%s: could not get address for node %s\n",
> - __func__, node->full_name);
> + pr_err("%s: could not get address for node %pOF\n",
> + __func__, node);
> return ret;
> }
>
> diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
> index 699429f28b73..4c395f9fd178 100644
> --- a/arch/arm/mach-shmobile/pm-rmobile.c
> +++ b/arch/arm/mach-shmobile/pm-rmobile.c
> @@ -195,8 +195,8 @@ static void __init add_special_pd(struct device_node *np, enum pd_types type)
> return;
> }
>
> - pr_debug("Special PM domain %s type %d for %s\n", pd->name, type,
> - np->full_name);
> + pr_debug("Special PM domain %s type %d for %pOF\n", pd->name, type,
> + np);
>
> special_pds[num_special_pds].pd = pd;
> special_pds[num_special_pds].type = type;
> @@ -331,13 +331,13 @@ static int __init rmobile_init_pm_domains(void)
> for_each_compatible_node(np, NULL, "renesas,sysc-rmobile") {
> base = of_iomap(np, 0);
> if (!base) {
> - pr_warn("%s cannot map reg 0\n", np->full_name);
> + pr_warn("%pOF cannot map reg 0\n", np);
> continue;
> }
>
> pmd = of_get_child_by_name(np, "pm-domains");
> if (!pmd) {
> - pr_warn("%s lacks pm-domains node\n", np->full_name);
> + pr_warn("%pOF lacks pm-domains node\n", np);
> continue;
> }
>
> --
> 2.11.0
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
More information about the linux-arm-kernel
mailing list