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/aoa/soundbus | |
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/aoa/soundbus')
-rw-r--r-- | sound/aoa/soundbus/core.c | 2 | ||||
-rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus-core.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c index 45680b5ebc35..6f004f70e308 100644 --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c | |||
@@ -96,7 +96,7 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp, | |||
96 | * it's not really legal to split it out with commas. We split it | 96 | * it's not really legal to split it out with commas. We split it |
97 | * up using a number of environment variables instead. */ | 97 | * up using a number of environment variables instead. */ |
98 | 98 | ||
99 | compat = get_property(of->node, "compatible", &cplen); | 99 | compat = of_get_property(of->node, "compatible", &cplen); |
100 | while (compat && cplen > 0) { | 100 | while (compat && cplen > 0) { |
101 | envp[i++] = scratch; | 101 | envp[i++] = scratch; |
102 | length = scnprintf (scratch, buffer_size, | 102 | length = scnprintf (scratch, buffer_size, |
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c index bbe50a0fa115..79fc4bc09e5e 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c +++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c | |||
@@ -141,7 +141,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index, | |||
141 | rc = of_address_to_resource(parent, pindex, res); | 141 | rc = of_address_to_resource(parent, pindex, res); |
142 | if (rc) | 142 | if (rc) |
143 | goto bail; | 143 | goto bail; |
144 | reg = get_property(np, "reg", NULL); | 144 | reg = of_get_property(np, "reg", NULL); |
145 | if (reg == NULL) { | 145 | if (reg == NULL) { |
146 | rc = -ENXIO; | 146 | rc = -ENXIO; |
147 | goto bail; | 147 | goto bail; |
@@ -188,7 +188,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | if (i == 1) { | 190 | if (i == 1) { |
191 | const u32 *layout_id = get_property(sound, "layout-id", NULL); | 191 | const u32 *layout_id = |
192 | of_get_property(sound, "layout-id", NULL); | ||
192 | if (layout_id) { | 193 | if (layout_id) { |
193 | layout = *layout_id; | 194 | layout = *layout_id; |
194 | snprintf(dev->sound.modalias, 32, | 195 | snprintf(dev->sound.modalias, 32, |