diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-02 20:52:17 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:17 -0400 |
commit | a7edd0e676d51145ae634a2acf7a447e319200fa (patch) | |
tree | 24047c72a067e7c670fca186d89b1b7c032e1bde /sound/aoa/soundbus/i2sbus | |
parent | 6c2d046980299d52d78b2738ad7f11fc593dea75 (diff) |
[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>
Diffstat (limited to 'sound/aoa/soundbus/i2sbus')
-rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus-core.c | 7 |
1 files changed, 3 insertions, 4 deletions
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, | |||
122 | { | 122 | { |
123 | struct device_node *parent; | 123 | struct device_node *parent; |
124 | int pindex, rc = -ENXIO; | 124 | int pindex, rc = -ENXIO; |
125 | u32 *reg; | 125 | const u32 *reg; |
126 | 126 | ||
127 | /* Machines with layout 76 and 36 (K2 based) have a weird device | 127 | /* Machines with layout 76 and 36 (K2 based) have a weird device |
128 | * tree what we need to special case. | 128 | * tree what we need to special case. |
@@ -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 = (u32 *)get_property(np, "reg", NULL); | 144 | reg = 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,8 +188,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | if (i == 1) { | 190 | if (i == 1) { |
191 | u32 *layout_id; | 191 | const u32 *layout_id = get_property(sound, "layout-id", NULL); |
192 | layout_id = (u32*) get_property(sound, "layout-id", NULL); | ||
193 | if (layout_id) { | 192 | if (layout_id) { |
194 | layout = *layout_id; | 193 | layout = *layout_id; |
195 | snprintf(dev->sound.modalias, 32, | 194 | snprintf(dev->sound.modalias, 32, |