summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 19:12:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-23 23:15:28 -0700
commit690c8fd31f1e35985d0f35772fde514da59ec9d1 (patch)
tree8a5a0036b3780a9eb315ea2201a2562570de1ebe /sound
parentde8d28b16f5614aeb12bb69c8f9a38578b8d3ada (diff)
downloadlinux-3.10-690c8fd31f1e35985d0f35772fde514da59ec9d1.tar.gz
linux-3.10-690c8fd31f1e35985d0f35772fde514da59ec9d1.tar.bz2
linux-3.10-690c8fd31f1e35985d0f35772fde514da59ec9d1.zip
[SPARC64]: Use in-kernel PROM tree for EBUS and ISA.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound')
-rw-r--r--sound/sparc/cs4231.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index b3efc9aa291..da54d04a3e3 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2284,15 +2284,14 @@ static int __init cs4231_init(void)
for_each_ebusdev(edev, ebus) {
int match = 0;
- if (!strcmp(edev->prom_name, "SUNW,CS4231")) {
+ if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
match = 1;
- } else if (!strcmp(edev->prom_name, "audio")) {
- char compat[16];
+ } else if (!strcmp(edev->prom_node->name, "audio")) {
+ char *compat;
- prom_getstring(edev->prom_node, "compatible",
- compat, sizeof(compat));
- compat[15] = '\0';
- if (!strcmp(compat, "SUNW,CS4231"))
+ compat = of_get_property(edev->prom_node,
+ "compatible", NULL);
+ if (compat && !strcmp(compat, "SUNW,CS4231"))
match = 1;
}