[POWERPC] get_property returns const

This just tidies up some of the remains.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

6 files changed, 18 insertions, 19 deletions

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index b00fc4842c93..bf7f03121fe7 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1062,9 +1062,9 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
                 if (device_is_compatible(dev, "pcm3052")) {
-                        u32 *addr;
+                        const u32 *addr;
                         printk(KERN_DEBUG PFX "found pcm3052\n");
-                        addr = (u32 *) get_property(dev, "reg", NULL);
+                        addr = get_property(dev, "reg", NULL);
                         if (!addr)
                                 return -ENODEV;
                         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 2cd81fa07ce1..ed6bdb073d83 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -939,9 +939,9 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
                 if (device_is_compatible(dev, "tas3004")) {
-                        u32 *addr;
+                        const u32 *addr;
                         printk(KERN_DEBUG PFX "found tas3004\n");
-                        addr = (u32 *) get_property(dev, "reg", NULL);
+                        addr = get_property(dev, "reg", NULL);
                         if (!addr)
                                 continue;
                         return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
@@ -950,7 +950,8 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
                  * property that says 'tas3004', they just have a 'deq'
                  * node without any such property... */
                 if (strcmp(dev->name, "deq") == 0) {
-                        u32 *_addr, addr;
+                        const u32 *_addr;
+                        u32 addr;
                         printk(KERN_DEBUG PFX "found 'deq' node\n");
                         _addr = (u32 *) get_property(dev, "i2c-address", NULL);
                         if (!_addr)
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c
index 2b03bc798bcb..d34e5db64780 100644
--- a/sound/aoa/core/snd-aoa-gpio-feature.c
+++ b/sound/aoa/core/snd-aoa-gpio-feature.c
@@ -55,7 +55,7 @@ static struct device_node *get_gpio(char *name,
                                     int *gpioactiveptr)
 {
         struct device_node *np, *gpio;
-        u32 *reg;
+        const u32 *reg;
         const char *audio_gpio;
 
         *gpioptr = -1;
@@ -84,7 +84,7 @@ static struct device_node *get_gpio(char *name,
                         return NULL;
         }
 
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = get_property(np, "reg", NULL);
         if (!reg)
                 return NULL;
 
@@ -96,7 +96,7 @@ static struct device_node *get_gpio(char *name,
         if (*gpioptr < 0x50)
                 *gpioptr += 0x50;
 
-        reg = (u32 *)get_property(np, "audio-gpio-active-state", NULL);
+        reg = get_property(np, "audio-gpio-active-state", NULL);
         if (!reg)
                 /* Apple seems to default to 1, but
                  * that doesn't seem right at least on most
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 1b94ba6dd279..7e3880901c61 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -724,7 +724,7 @@ static int check_codec(struct aoa_codec *codec,
                        struct layout_dev *ldev,
                        struct codec_connect_info *cci)
 {
-        u32 *ref;
+        const u32 *ref;
         char propname[32];
         struct codec_connection *cc;
 
@@ -732,7 +732,7 @@ static int check_codec(struct aoa_codec *codec,
         if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {
                 snprintf(propname, sizeof(propname),
                          "platform-%s-codec-ref", codec->name);
-                ref = (u32*)get_property(ldev->sound, propname, NULL);
+                ref = get_property(ldev->sound, propname, NULL);
                 if (!ref) {
                         printk(KERN_INFO "snd-aoa-fabric-layout: "
                                 "required property %s not present\n", propname);
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index 47b3e3768df0..45680b5ebc35 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -61,9 +61,10 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
 {
         struct soundbus_dev * soundbus_dev;
         struct of_device * of;
-        char *scratch, *compat, *compat2;
+        char *scratch;
+        const char *compat;
         int i = 0;
-        int length, cplen, cplen2, seen = 0;
+        int length, cplen, seen = 0;
 
         if (!dev)
                 return -ENODEV;
@@ -95,9 +96,7 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = (char *) get_property(of->node, "compatible", &cplen);
-        compat2 = compat;
-        cplen2= cplen;
+        compat = get_property(of->node, "compatible", &cplen);
         while (compat && cplen > 0) {
                 envp[i++] = scratch;
                 length = scnprintf (scratch, buffer_size,
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index e36f6aa448d4..bbe50a0fa115 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -122,7 +122,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
 {
         struct device_node *parent;
         int pindex, rc = -ENXIO;
-        u32 *reg;
+        const u32 *reg;
 
         /* Machines with layout 76 and 36 (K2 based) have a weird device
          * tree what we need to special case.
@@ -141,7 +141,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
         rc = of_address_to_resource(parent, pindex, res);
         if (rc)
                 goto bail;
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = get_property(np, "reg", NULL);
         if (reg == NULL) {
                 rc = -ENXIO;
                 goto bail;
@@ -188,8 +188,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                 }
         }
         if (i == 1) {
-                u32 *layout_id;
-                layout_id = (u32*) get_property(sound, "layout-id", NULL);
+                const u32 *layout_id = get_property(sound, "layout-id", NULL);
                 if (layout_id) {
                         layout = *layout_id;
                         snprintf(dev->sound.modalias, 32,