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/oss | |
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/oss')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 12 | ||||
-rw-r--r-- | sound/oss/dmasound/tas_common.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 7aa4d43ae6cd..977b91cea603 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -357,7 +357,7 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* | |||
357 | while(np != 0) { | 357 | while(np != 0) { |
358 | if (name) { | 358 | if (name) { |
359 | const char *property = | 359 | const char *property = |
360 | get_property(np,"audio-gpio",NULL); | 360 | of_get_property(np,"audio-gpio",NULL); |
361 | if (property != 0 && strcmp(property,name) == 0) | 361 | if (property != 0 && strcmp(property,name) == 0) |
362 | break; | 362 | break; |
363 | } else if (compatible && device_is_compatible(np, compatible)) | 363 | } else if (compatible && device_is_compatible(np, compatible)) |
@@ -366,11 +366,11 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* | |||
366 | } | 366 | } |
367 | if (!np) | 367 | if (!np) |
368 | return -ENODEV; | 368 | return -ENODEV; |
369 | pp = get_property(np, "AAPL,address", NULL); | 369 | pp = of_get_property(np, "AAPL,address", NULL); |
370 | if (!pp) | 370 | if (!pp) |
371 | return -ENODEV; | 371 | return -ENODEV; |
372 | *gpio_addr = (*pp) & 0x0000ffff; | 372 | *gpio_addr = (*pp) & 0x0000ffff; |
373 | pp = get_property(np, "audio-gpio-active-state", NULL); | 373 | pp = of_get_property(np, "audio-gpio-active-state", NULL); |
374 | if (pp) | 374 | if (pp) |
375 | *gpio_pol = *pp; | 375 | *gpio_pol = *pp; |
376 | else | 376 | else |
@@ -2977,16 +2977,16 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev); | |||
2977 | 2977 | ||
2978 | sound_device_id = 0; | 2978 | sound_device_id = 0; |
2979 | /* device ID appears post g3 b&w */ | 2979 | /* device ID appears post g3 b&w */ |
2980 | prop = get_property(info, "device-id", NULL); | 2980 | prop = of_get_property(info, "device-id", NULL); |
2981 | if (prop != 0) | 2981 | if (prop != 0) |
2982 | sound_device_id = *prop; | 2982 | sound_device_id = *prop; |
2983 | 2983 | ||
2984 | /* look for a property saying what sample rates | 2984 | /* look for a property saying what sample rates |
2985 | are available */ | 2985 | are available */ |
2986 | 2986 | ||
2987 | prop = get_property(info, "sample-rates", &l); | 2987 | prop = of_get_property(info, "sample-rates", &l); |
2988 | if (prop == 0) | 2988 | if (prop == 0) |
2989 | prop = get_property(info, "output-frame-rates", &l); | 2989 | prop = of_get_property(info, "output-frame-rates", &l); |
2990 | 2990 | ||
2991 | /* if it's there use it to set up frame rates */ | 2991 | /* if it's there use it to set up frame rates */ |
2992 | init_frame_rates(prop, l) ; | 2992 | init_frame_rates(prop, l) ; |
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 5e2c0aed5472..11257600d6d0 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c | |||
@@ -200,7 +200,7 @@ tas_init(int driver_id, const char *driver_name) | |||
200 | tas_node = find_devices("deq"); | 200 | tas_node = find_devices("deq"); |
201 | if (tas_node == NULL) | 201 | if (tas_node == NULL) |
202 | return -ENODEV; | 202 | return -ENODEV; |
203 | paddr = get_property(tas_node, "i2c-address", NULL); | 203 | paddr = of_get_property(tas_node, "i2c-address", NULL); |
204 | if (paddr) { | 204 | if (paddr) { |
205 | tas_i2c_address = (*paddr) >> 1; | 205 | tas_i2c_address = (*paddr) >> 1; |
206 | printk(KERN_INFO "using i2c address: 0x%x from device-tree\n", | 206 | printk(KERN_INFO "using i2c address: 0x%x from device-tree\n", |