diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 21:32:18 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 21:32:18 +0300 |
commit | c2f1f3e0e17d94ab0c66d83e669492cb9e9a3698 (patch) | |
tree | 7d8db32f9fdfb2dd698e6056296f7e9e99c85a94 /drivers/sbus/char/bbc_envctrl.c | |
parent | 9830afca9273787f32e236ae5d0e4d3a378ae842 (diff) | |
parent | c23b8e7acea3dc034edeb902f0c843856e215938 (diff) | |
download | linux-c2f1f3e0e17d94ab0c66d83e669492cb9e9a3698.tar.xz |
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 'drivers/sbus/char/bbc_envctrl.c')
-rw-r--r-- | drivers/sbus/char/bbc_envctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index fb5bcf6dddc1..4f2dd21e44a0 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c @@ -571,9 +571,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp) int devidx = 0; while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) { - if (!strcmp(op->dev.of_node->name, "temperature")) + if (of_node_name_eq(op->dev.of_node, "temperature")) attach_one_temp(bp, op, temp_index++); - if (!strcmp(op->dev.of_node->name, "fan-control")) + if (of_node_name_eq(op->dev.of_node, "fan-control")) attach_one_fan(bp, op, fan_index++); } if (temp_index != 0 && fan_index != 0) { |