diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-18 13:35:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-18 13:35:31 -0800 |
| commit | 20a9da34ae009176e443e217f3747635fc4bc57f (patch) | |
| tree | 92e27b19a55ec7c039a4941e861f668fd3b0cdc8 /arch/sparc/kernel/chmc.c | |
| parent | 25e19c1fe421280a47f37c3571aa379e6e67966c (diff) | |
| parent | 86ef771ed543ad19fd984e715348eaeeb0b4e035 (diff) | |
Merge branch 'sparc-OF-name-and-device_type-rework'
Rob Herring says:
====================
sparc: OF name and device_type rework
All other platforms have been converted to only store the local node name
in device_node.full_name except Sparc. Sparc was complicated by having a
path_component_name in addition to full_name and name. By switching
full_name to just the local node name, path_component_name becomes
redundant and can be removed.
The rest of the series converts the sparc code to use printf specifiers
and helper functions to access node name and device_type instead of
directly accessing device_node full_name, name and type pointers.
I've tested this series under qemu.
v2:
- Add patch using of_node_name_eq for openpromfs
- Add patch converting some resource names to full_name
- Also drop full path on !Sparc PDT node name construction
- Add a few missed %pOFn conversions
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/chmc.c')
| -rw-r--r-- | arch/sparc/kernel/chmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 0de4bcb8261f..61fe1b951ba3 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c @@ -464,8 +464,8 @@ static int jbusmc_probe(struct platform_device *op) mc_list_add(&p->list); - printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %s\n", - op->dev.of_node->full_name); + printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %pOF\n", + op->dev.of_node); dev_set_drvdata(&op->dev, p); @@ -747,8 +747,8 @@ static int chmc_probe(struct platform_device *op) mc_list_add(&p->list); - printk(KERN_INFO PFX "UltraSPARC-III memory controller at %s [%s]\n", - dp->full_name, + printk(KERN_INFO PFX "UltraSPARC-III memory controller at %pOF [%s]\n", + dp, (p->layout_size ? "ACTIVE" : "INACTIVE")); dev_set_drvdata(&op->dev, p); |
