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/83xx | |
| 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/83xx')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_itx.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_sys.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/pci.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c index b46305645d38..d9675f9b9766 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_itx.c +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c | |||
| @@ -80,8 +80,8 @@ static void __init mpc834x_itx_setup_arch(void) | |||
| 80 | 80 | ||
| 81 | np = of_find_node_by_type(NULL, "cpu"); | 81 | np = of_find_node_by_type(NULL, "cpu"); |
| 82 | if (np != 0) { | 82 | if (np != 0) { |
| 83 | unsigned int *fp = | 83 | const unsigned int *fp = |
| 84 | (int *)get_property(np, "clock-frequency", NULL); | 84 | get_property(np, "clock-frequency", NULL); |
| 85 | if (fp != 0) | 85 | if (fp != 0) |
| 86 | loops_per_jiffy = *fp / HZ; | 86 | loops_per_jiffy = *fp / HZ; |
| 87 | else | 87 | else |
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c index 3e1c16eb4a63..5eadf9d035f1 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_sys.c +++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c | |||
| @@ -84,8 +84,8 @@ static void __init mpc834x_sys_setup_arch(void) | |||
| 84 | 84 | ||
| 85 | np = of_find_node_by_type(NULL, "cpu"); | 85 | np = of_find_node_by_type(NULL, "cpu"); |
| 86 | if (np != 0) { | 86 | if (np != 0) { |
| 87 | unsigned int *fp = | 87 | const unsigned int *fp = |
| 88 | (int *)get_property(np, "clock-frequency", NULL); | 88 | get_property(np, "clock-frequency", NULL); |
| 89 | if (fp != 0) | 89 | if (fp != 0) |
| 90 | loops_per_jiffy = *fp / HZ; | 90 | loops_per_jiffy = *fp / HZ; |
| 91 | else | 91 | else |
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c index 3b5e563c279f..9c3650555144 100644 --- a/arch/powerpc/platforms/83xx/pci.c +++ b/arch/powerpc/platforms/83xx/pci.c | |||
| @@ -50,7 +50,7 @@ int __init add_bridge(struct device_node *dev) | |||
| 50 | int len; | 50 | int len; |
| 51 | struct pci_controller *hose; | 51 | struct pci_controller *hose; |
| 52 | struct resource rsrc; | 52 | struct resource rsrc; |
| 53 | int *bus_range; | 53 | const int *bus_range; |
| 54 | int primary = 1, has_address = 0; | 54 | int primary = 1, has_address = 0; |
| 55 | phys_addr_t immr = get_immrbase(); | 55 | phys_addr_t immr = get_immrbase(); |
| 56 | 56 | ||
| @@ -60,7 +60,7 @@ int __init add_bridge(struct device_node *dev) | |||
| 60 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); | 60 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); |
| 61 | 61 | ||
| 62 | /* Get bus range if any */ | 62 | /* Get bus range if any */ |
| 63 | bus_range = (int *)get_property(dev, "bus-range", &len); | 63 | bus_range = get_property(dev, "bus-range", &len); |
| 64 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 64 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
| 65 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 65 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
| 66 | " bus 0\n", dev->full_name); | 66 | " bus 0\n", dev->full_name); |