summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rockchip
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-09-05 20:29:46 -0700
committerOlof Johansson <olof@lixom.net>2017-09-05 20:29:46 -0700
commit9ec83463d679a51560135ac8cf023567fbb6e4c0 (patch)
treec79dd6cfc3bc99af5590298eebf55ab7ee354b01 /arch/arm/mach-rockchip
parenta93fae750d462ae94b83c5c4e21ffa67e4870135 (diff)
parent2ad93fa37fdd7f5525333240633557effacb28ff (diff)
downloadlinux-9ec83463d679a51560135ac8cf023567fbb6e4c0.tar.bz2
Merge branch 'next/cleanup' into next/soc
* next/cleanup: soc: versatile: remove unnecessary static in realview_soc_probe() ARM: Convert to using %pOF instead of full_name ARM: hisi: Fix typo in comment ARM: OMAP4+: PRM: fix of_irq_get() result checks ARM: OMAP3+: PRM: fix of_irq_get() result check ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap ARM: OMAP2+: omap_device: drop broken RPM status update from suspend_noirq bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
Diffstat (limited to 'arch/arm/mach-rockchip')
-rw-r--r--arch/arm/mach-rockchip/platsmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index 420ba6765223..ecec340ca345 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;
}