diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 08:39:14 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:19 -0400 |
commit | c4f55b394505fff6ad831d17e36e02dde1c3a8d7 (patch) | |
tree | cb7b24d1b0cd1cd2df4361105c33657af2bf7a97 /sound/ppc/tumbler.c | |
parent | e2eb63927bfcb54232163bfec32440246fd44457 (diff) |
[POWERPC] Rename get_property to of_get_property: sound
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'sound/ppc/tumbler.c')
-rw-r--r-- | sound/ppc/tumbler.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 8f074c7936e6..8e01b558131d 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -1037,7 +1037,7 @@ static struct device_node *find_audio_device(const char *name) | |||
1037 | return NULL; | 1037 | return NULL; |
1038 | 1038 | ||
1039 | for (np = np->child; np; np = np->sibling) { | 1039 | for (np = np->child; np; np = np->sibling) { |
1040 | const char *property = get_property(np, "audio-gpio", NULL); | 1040 | const char *property = of_get_property(np, "audio-gpio", NULL); |
1041 | if (property && strcmp(property, name) == 0) | 1041 | if (property && strcmp(property, name) == 0) |
1042 | return np; | 1042 | return np; |
1043 | } | 1043 | } |
@@ -1077,9 +1077,9 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1077 | return -ENODEV; | 1077 | return -ENODEV; |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | base = get_property(node, "AAPL,address", NULL); | 1080 | base = of_get_property(node, "AAPL,address", NULL); |
1081 | if (! base) { | 1081 | if (! base) { |
1082 | base = get_property(node, "reg", NULL); | 1082 | base = of_get_property(node, "reg", NULL); |
1083 | if (!base) { | 1083 | if (!base) { |
1084 | DBG("(E) cannot find address for device %s !\n", device); | 1084 | DBG("(E) cannot find address for device %s !\n", device); |
1085 | snd_printd("cannot find address for device %s\n", device); | 1085 | snd_printd("cannot find address for device %s\n", device); |
@@ -1093,7 +1093,7 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1093 | 1093 | ||
1094 | gp->addr = addr & 0x0000ffff; | 1094 | gp->addr = addr & 0x0000ffff; |
1095 | /* Try to find the active state, default to 0 ! */ | 1095 | /* Try to find the active state, default to 0 ! */ |
1096 | base = get_property(node, "audio-gpio-active-state", NULL); | 1096 | base = of_get_property(node, "audio-gpio-active-state", NULL); |
1097 | if (base) { | 1097 | if (base) { |
1098 | gp->active_state = *base; | 1098 | gp->active_state = *base; |
1099 | gp->active_val = (*base) ? 0x5 : 0x4; | 1099 | gp->active_val = (*base) ? 0x5 : 0x4; |
@@ -1108,7 +1108,7 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1108 | * as we don't yet have an interpreter for these things | 1108 | * as we don't yet have an interpreter for these things |
1109 | */ | 1109 | */ |
1110 | if (platform) | 1110 | if (platform) |
1111 | prop = get_property(node, platform, NULL); | 1111 | prop = of_get_property(node, platform, NULL); |
1112 | if (prop) { | 1112 | if (prop) { |
1113 | if (prop[3] == 0x9 && prop[4] == 0x9) { | 1113 | if (prop[3] == 0x9 && prop[4] == 0x9) { |
1114 | gp->active_val = 0xd; | 1114 | gp->active_val = 0xd; |
@@ -1310,7 +1310,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1310 | { | 1310 | { |
1311 | int i, err; | 1311 | int i, err; |
1312 | struct pmac_tumbler *mix; | 1312 | struct pmac_tumbler *mix; |
1313 | u32 *paddr; | 1313 | const u32 *paddr; |
1314 | struct device_node *tas_node, *np; | 1314 | struct device_node *tas_node, *np; |
1315 | char *chipname; | 1315 | char *chipname; |
1316 | 1316 | ||
@@ -1331,9 +1331,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1331 | 1331 | ||
1332 | for (np = chip->node->child; np; np = np->sibling) { | 1332 | for (np = chip->node->child; np; np = np->sibling) { |
1333 | if (!strcmp(np->name, "sound")) { | 1333 | if (!strcmp(np->name, "sound")) { |
1334 | if (get_property(np, "has-anded-reset", NULL)) | 1334 | if (of_get_property(np, "has-anded-reset", NULL)) |
1335 | mix->anded_reset = 1; | 1335 | mix->anded_reset = 1; |
1336 | if (get_property(np, "layout-id", NULL)) | 1336 | if (of_get_property(np, "layout-id", NULL)) |
1337 | mix->reset_on_sleep = 0; | 1337 | mix->reset_on_sleep = 0; |
1338 | break; | 1338 | break; |
1339 | } | 1339 | } |
@@ -1348,9 +1348,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1348 | if (tas_node == NULL) | 1348 | if (tas_node == NULL) |
1349 | return -ENODEV; | 1349 | return -ENODEV; |
1350 | 1350 | ||
1351 | paddr = (u32 *)get_property(tas_node, "i2c-address", NULL); | 1351 | paddr = of_get_property(tas_node, "i2c-address", NULL); |
1352 | if (paddr == NULL) | 1352 | if (paddr == NULL) |
1353 | paddr = (u32 *)get_property(tas_node, "reg", NULL); | 1353 | paddr = of_get_property(tas_node, "reg", NULL); |
1354 | if (paddr) | 1354 | if (paddr) |
1355 | mix->i2c.addr = (*paddr) >> 1; | 1355 | mix->i2c.addr = (*paddr) >> 1; |
1356 | else | 1356 | else |