2 files changed, 17 insertions, 17 deletions

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index c64af55865d4..5e829683d1ad 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -864,7 +864,8 @@ static void __init detect_byte_swap(struct snd_pmac *chip)
 static int __init snd_pmac_detect(struct snd_pmac *chip)
 {
         struct device_node *sound = NULL;
-        unsigned int *prop, l;
+        const unsigned int *prop;
+        unsigned int l;
         struct macio_chip* macio;
 
         if (!machine_is(powermac))
@@ -923,10 +924,10 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
         }
         if (! sound)
                 return -ENODEV;
-        prop = (unsigned int *) get_property(sound, "sub-frame", NULL);
+        prop = of_get_property(sound, "sub-frame", NULL);
         if (prop && *prop < 16)
                 chip->subframe = *prop;
-        prop = (unsigned int *) get_property(sound, "layout-id", NULL);
+        prop = of_get_property(sound, "layout-id", NULL);
         if (prop) {
                 /* partly deprecate snd-powermac, for those machines
                  * that have a layout-id property for now */
@@ -967,7 +968,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 chip->freq_table = tumbler_freqs;
                 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
         }
-        prop = (unsigned int *)get_property(sound, "device-id", NULL);
+        prop = of_get_property(sound, "device-id", NULL);
         if (prop)
                 chip->device_id = *prop;
         chip->has_iic = (find_devices("perch") != NULL);
@@ -997,10 +998,9 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 
         /* look for a property saying what sample rates
            are available */
-        prop = (unsigned int *) get_property(sound, "sample-rates", &l);
+        prop = of_get_property(sound, "sample-rates", &l);
         if (! prop)
-                prop = (unsigned int *) get_property(sound,
-                                                     "output-frame-rates", &l);
+                prop = of_get_property(sound, "output-frame-rates", &l);
         if (prop) {
                 int i;
                 chip->freqs_ok = 0;
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)
                 return NULL;
   
         for (np = np->child; np; np = np->sibling) {
-                const char *property = get_property(np, "audio-gpio", NULL);
+                const char *property = of_get_property(np, "audio-gpio", NULL);
                 if (property && strcmp(property, name) == 0)
                         return np;
         }  
@@ -1077,9 +1077,9 @@ static long tumbler_find_device(const char *device, const char *platform,
                 return -ENODEV;
         }
 
-        base = get_property(node, "AAPL,address", NULL);
+        base = of_get_property(node, "AAPL,address", NULL);
         if (! base) {
-                base = get_property(node, "reg", NULL);
+                base = of_get_property(node, "reg", NULL);
                 if (!base) {
                         DBG("(E) cannot find address for device %s !\n", device);
                         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,
 
         gp->addr = addr & 0x0000ffff;
         /* Try to find the active state, default to 0 ! */
-        base = get_property(node, "audio-gpio-active-state", NULL);
+        base = of_get_property(node, "audio-gpio-active-state", NULL);
         if (base) {
                 gp->active_state = *base;
                 gp->active_val = (*base) ? 0x5 : 0x4;
@@ -1108,7 +1108,7 @@ static long tumbler_find_device(const char *device, const char *platform,
                  * as we don't yet have an interpreter for these things
                  */
                 if (platform)
-                        prop = get_property(node, platform, NULL);
+                        prop = of_get_property(node, platform, NULL);
                 if (prop) {
                         if (prop[3] == 0x9 && prop[4] == 0x9) {
                                 gp->active_val = 0xd;
@@ -1310,7 +1310,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 {
         int i, err;
         struct pmac_tumbler *mix;
-        u32 *paddr;
+        const u32 *paddr;
         struct device_node *tas_node, *np;
         char *chipname;
 
@@ -1331,9 +1331,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 
         for (np = chip->node->child; np; np = np->sibling) {
                 if (!strcmp(np->name, "sound")) {
-                        if (get_property(np, "has-anded-reset", NULL))
+                        if (of_get_property(np, "has-anded-reset", NULL))
                                 mix->anded_reset = 1;
-                        if (get_property(np, "layout-id", NULL))
+                        if (of_get_property(np, "layout-id", NULL))
                                 mix->reset_on_sleep = 0;
                         break;
                 }
@@ -1348,9 +1348,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
         if (tas_node == NULL)
                 return -ENODEV;
 
-        paddr = (u32 *)get_property(tas_node, "i2c-address", NULL);
+        paddr = of_get_property(tas_node, "i2c-address", NULL);
         if (paddr == NULL)
-                paddr = (u32 *)get_property(tas_node, "reg", NULL);
+                paddr = of_get_property(tas_node, "reg", NULL);
         if (paddr)
                 mix->i2c.addr = (*paddr) >> 1;
         else