diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:39:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:04 -0400 |
commit | 8efca49329a50710d656a8bb78d6f0f0e2f48a26 (patch) | |
tree | 6843306ed52bb6f9b932633ddaf1df90431a2ab6 /arch/powerpc/platforms/86xx | |
parent | c4c7cba90cf9f180a2c45f7e54143f786360f3dd (diff) |
[POWERPC] mpc: Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.
mpc* platform changes.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/pci.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index ebae73eb0063..839090682ab2 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | |||
@@ -323,9 +323,9 @@ mpc86xx_hpcn_setup_arch(void) | |||
323 | 323 | ||
324 | np = of_find_node_by_type(NULL, "cpu"); | 324 | np = of_find_node_by_type(NULL, "cpu"); |
325 | if (np != 0) { | 325 | if (np != 0) { |
326 | unsigned int *fp; | 326 | const unsigned int *fp; |
327 | 327 | ||
328 | fp = (int *)get_property(np, "clock-frequency", NULL); | 328 | fp = get_property(np, "clock-frequency", NULL); |
329 | if (fp != 0) | 329 | if (fp != 0) |
330 | loops_per_jiffy = *fp / HZ; | 330 | loops_per_jiffy = *fp / HZ; |
331 | else | 331 | else |
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c index bc5139043112..d7050c1108ff 100644 --- a/arch/powerpc/platforms/86xx/pci.c +++ b/arch/powerpc/platforms/86xx/pci.c | |||
@@ -153,7 +153,7 @@ int __init add_bridge(struct device_node *dev) | |||
153 | int len; | 153 | int len; |
154 | struct pci_controller *hose; | 154 | struct pci_controller *hose; |
155 | struct resource rsrc; | 155 | struct resource rsrc; |
156 | int *bus_range; | 156 | const int *bus_range; |
157 | int has_address = 0; | 157 | int has_address = 0; |
158 | int primary = 0; | 158 | int primary = 0; |
159 | 159 | ||
@@ -163,7 +163,7 @@ int __init add_bridge(struct device_node *dev) | |||
163 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); | 163 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); |
164 | 164 | ||
165 | /* Get bus range if any */ | 165 | /* Get bus range if any */ |
166 | bus_range = (int *) get_property(dev, "bus-range", &len); | 166 | bus_range = get_property(dev, "bus-range", &len); |
167 | if (bus_range == NULL || len < 2 * sizeof(int)) | 167 | if (bus_range == NULL || len < 2 * sizeof(int)) |
168 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 168 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
169 | " bus 0\n", dev->full_name); | 169 | " bus 0\n", dev->full_name); |