aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/central.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-26 10:32:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-26 10:32:18 -0800
commitc2f1f3e0e17d94ab0c66d83e669492cb9e9a3698 (patch)
tree7d8db32f9fdfb2dd698e6056296f7e9e99c85a94 /arch/sparc/kernel/central.c
parentMerge tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux (diff)
parentALSA: sparc: Use of_node_name_eq for node name comparisons (diff)
downloadlinux-dev-c2f1f3e0e17d94ab0c66d83e669492cb9e9a3698.tar.xz
linux-dev-c2f1f3e0e17d94ab0c66d83e669492cb9e9a3698.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
Pull sparc updates from David Miller: - Automatic system call table generation, from Firoz Khan. - Clean up accesses to the OF device names by using full_name instead of path_component_name. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: ALSA: sparc: Use of_node_name_eq for node name comparisons sbus: Use of_node_name_eq for node name comparisons sparc: generate uapi header and system call table files sparc: add system call table generation support sparc: add __NR_syscalls along with NR_syscalls sparc: move __IGNORE* entries to non uapi header sparc: Use DT node full_name instead of name for resources sparc: Remove unused leon_trans_init sparc: Use device_type helpers to access the node type sparc: Use of_node_name_eq for node name comparisons sparc: Convert to using %pOFn instead of device_node.name sparc: prom: use property "name" directly to construct node names of: Drop full path from full_name for PDT systems sparc: Convert to using %pOF instead of full_name fs/openpromfs: Use of_node_name_eq for node name comparisons fs/openpromfs: use full_name instead of path_component_name
Diffstat (limited to 'arch/sparc/kernel/central.c')
-rw-r--r--arch/sparc/kernel/central.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 38ae4fdc9eb4..bfae98ab8638 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -168,7 +168,7 @@ static int fhc_probe(struct platform_device *op)
goto out;
}
- if (!strcmp(op->dev.of_node->parent->name, "central"))
+ if (of_node_name_eq(op->dev.of_node->parent, "central"))
p->central = true;
p->pregs = of_ioremap(&op->resource[0], 0,