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/codecs | |
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/codecs')
-rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-onyx.c | 2 | ||||
-rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-tas.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c index bf7f03121fe7..7f980be5d060 100644 --- a/sound/aoa/codecs/snd-aoa-codec-onyx.c +++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c | |||
@@ -1064,7 +1064,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter) | |||
1064 | if (device_is_compatible(dev, "pcm3052")) { | 1064 | if (device_is_compatible(dev, "pcm3052")) { |
1065 | const u32 *addr; | 1065 | const u32 *addr; |
1066 | printk(KERN_DEBUG PFX "found pcm3052\n"); | 1066 | printk(KERN_DEBUG PFX "found pcm3052\n"); |
1067 | addr = get_property(dev, "reg", NULL); | 1067 | addr = of_get_property(dev, "reg", NULL); |
1068 | if (!addr) | 1068 | if (!addr) |
1069 | return -ENODEV; | 1069 | return -ENODEV; |
1070 | return onyx_create(adapter, dev, (*addr)>>1); | 1070 | return onyx_create(adapter, dev, (*addr)>>1); |
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c index ed6bdb073d83..ceca38486eae 100644 --- a/sound/aoa/codecs/snd-aoa-codec-tas.c +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c | |||
@@ -941,7 +941,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
941 | if (device_is_compatible(dev, "tas3004")) { | 941 | if (device_is_compatible(dev, "tas3004")) { |
942 | const u32 *addr; | 942 | const u32 *addr; |
943 | printk(KERN_DEBUG PFX "found tas3004\n"); | 943 | printk(KERN_DEBUG PFX "found tas3004\n"); |
944 | addr = get_property(dev, "reg", NULL); | 944 | addr = of_get_property(dev, "reg", NULL); |
945 | if (!addr) | 945 | if (!addr) |
946 | continue; | 946 | continue; |
947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); | 947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); |
@@ -953,7 +953,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
953 | const u32 *_addr; | 953 | const u32 *_addr; |
954 | u32 addr; | 954 | u32 addr; |
955 | printk(KERN_DEBUG PFX "found 'deq' node\n"); | 955 | printk(KERN_DEBUG PFX "found 'deq' node\n"); |
956 | _addr = (u32 *) get_property(dev, "i2c-address", NULL); | 956 | _addr = of_get_property(dev, "i2c-address", NULL); |
957 | if (!_addr) | 957 | if (!_addr) |
958 | continue; | 958 | continue; |
959 | addr = ((*_addr) >> 1) & 0x7f; | 959 | addr = ((*_addr) >> 1) & 0x7f; |