diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 08:26:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:19 -0400 |
commit | e2eb63927bfcb54232163bfec32440246fd44457 (patch) | |
tree | 596656edeb2332b5134d8236fa50b87f2c0ece29 /arch/powerpc/platforms/embedded6xx | |
parent | ceef87782a9452eeeca774e65d7f4e06455780a3 (diff) |
[POWERPC] Rename get_property to of_get_property: arch/powerpc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/ls_uart.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 3f6c4114f908..b412f006a9c5 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c | |||
@@ -58,11 +58,11 @@ static int __init add_bridge(struct device_node *dev) | |||
58 | { | 58 | { |
59 | int len; | 59 | int len; |
60 | struct pci_controller *hose; | 60 | struct pci_controller *hose; |
61 | int *bus_range; | 61 | const int *bus_range; |
62 | 62 | ||
63 | printk("Adding PCI host bridge %s\n", dev->full_name); | 63 | printk("Adding PCI host bridge %s\n", dev->full_name); |
64 | 64 | ||
65 | bus_range = (int *) get_property(dev, "bus-range", &len); | 65 | bus_range = of_get_property(dev, "bus-range", &len); |
66 | if (bus_range == NULL || len < 2 * sizeof(int)) | 66 | if (bus_range == NULL || len < 2 * sizeof(int)) |
67 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 67 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
68 | " bus 0\n", dev->full_name); | 68 | " bus 0\n", dev->full_name); |
@@ -106,7 +106,7 @@ static void __init linkstation_init_IRQ(void) | |||
106 | { | 106 | { |
107 | struct mpic *mpic; | 107 | struct mpic *mpic; |
108 | struct device_node *dnp; | 108 | struct device_node *dnp; |
109 | void *prop; | 109 | const u32 *prop; |
110 | int size; | 110 | int size; |
111 | phys_addr_t paddr; | 111 | phys_addr_t paddr; |
112 | 112 | ||
@@ -114,7 +114,7 @@ static void __init linkstation_init_IRQ(void) | |||
114 | if (dnp == NULL) | 114 | if (dnp == NULL) |
115 | return; | 115 | return; |
116 | 116 | ||
117 | prop = (struct device_node *)get_property(dnp, "reg", &size); | 117 | prop = of_get_property(dnp, "reg", &size); |
118 | paddr = (phys_addr_t)of_translate_address(dnp, prop); | 118 | paddr = (phys_addr_t)of_translate_address(dnp, prop); |
119 | 119 | ||
120 | mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC "); | 120 | mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC "); |
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c index 0e837762cc5b..d0bee9f19e4e 100644 --- a/arch/powerpc/platforms/embedded6xx/ls_uart.c +++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c | |||
@@ -110,8 +110,8 @@ static int __init ls_uarts_init(void) | |||
110 | if (!avr) | 110 | if (!avr) |
111 | return -EINVAL; | 111 | return -EINVAL; |
112 | 112 | ||
113 | avr_clock = *(u32*)get_property(avr, "clock-frequency", &len); | 113 | avr_clock = *(u32*)of_get_property(avr, "clock-frequency", &len); |
114 | phys_addr = ((u32*)get_property(avr, "reg", &len))[0]; | 114 | phys_addr = ((u32*)of_get_property(avr, "reg", &len))[0]; |
115 | 115 | ||
116 | if (!avr_clock || !phys_addr) | 116 | if (!avr_clock || !phys_addr) |
117 | return -EINVAL; | 117 | return -EINVAL; |
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index 604b47dd915c..c3f64ddb0be6 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | |||
@@ -81,7 +81,7 @@ static void __init mpc7448_hpc2_setup_arch(void) | |||
81 | if (cpu != 0) { | 81 | if (cpu != 0) { |
82 | const unsigned int *fp; | 82 | const unsigned int *fp; |
83 | 83 | ||
84 | fp = get_property(cpu, "clock-frequency", NULL); | 84 | fp = of_get_property(cpu, "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 |
@@ -132,7 +132,7 @@ static void __init mpc7448_hpc2_init_IRQ(void) | |||
132 | tsi_pic = of_find_node_by_type(NULL, "open-pic"); | 132 | tsi_pic = of_find_node_by_type(NULL, "open-pic"); |
133 | if (tsi_pic) { | 133 | if (tsi_pic) { |
134 | unsigned int size; | 134 | unsigned int size; |
135 | const void *prop = get_property(tsi_pic, "reg", &size); | 135 | const void *prop = of_get_property(tsi_pic, "reg", &size); |
136 | mpic_paddr = of_translate_address(tsi_pic, prop); | 136 | mpic_paddr = of_translate_address(tsi_pic, prop); |
137 | } | 137 | } |
138 | 138 | ||