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/sysdev/dcr.c | |
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/sysdev/dcr.c')
-rw-r--r-- | arch/powerpc/sysdev/dcr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c index 1fc5819e7d18..574b6ef44e0b 100644 --- a/arch/powerpc/sysdev/dcr.c +++ b/arch/powerpc/sysdev/dcr.c | |||
@@ -26,7 +26,7 @@ | |||
26 | unsigned int dcr_resource_start(struct device_node *np, unsigned int index) | 26 | unsigned int dcr_resource_start(struct device_node *np, unsigned int index) |
27 | { | 27 | { |
28 | unsigned int ds; | 28 | unsigned int ds; |
29 | const u32 *dr = get_property(np, "dcr-reg", &ds); | 29 | const u32 *dr = of_get_property(np, "dcr-reg", &ds); |
30 | 30 | ||
31 | if (dr == NULL || ds & 1 || index >= (ds / 8)) | 31 | if (dr == NULL || ds & 1 || index >= (ds / 8)) |
32 | return 0; | 32 | return 0; |
@@ -37,7 +37,7 @@ unsigned int dcr_resource_start(struct device_node *np, unsigned int index) | |||
37 | unsigned int dcr_resource_len(struct device_node *np, unsigned int index) | 37 | unsigned int dcr_resource_len(struct device_node *np, unsigned int index) |
38 | { | 38 | { |
39 | unsigned int ds; | 39 | unsigned int ds; |
40 | const u32 *dr = get_property(np, "dcr-reg", &ds); | 40 | const u32 *dr = of_get_property(np, "dcr-reg", &ds); |
41 | 41 | ||
42 | if (dr == NULL || ds & 1 || index >= (ds / 8)) | 42 | if (dr == NULL || ds & 1 || index >= (ds / 8)) |
43 | return 0; | 43 | return 0; |
@@ -53,9 +53,9 @@ static struct device_node * find_dcr_parent(struct device_node * node) | |||
53 | const u32 *p; | 53 | const u32 *p; |
54 | 54 | ||
55 | for (par = of_node_get(node); par;) { | 55 | for (par = of_node_get(node); par;) { |
56 | if (get_property(par, "dcr-controller", NULL)) | 56 | if (of_get_property(par, "dcr-controller", NULL)) |
57 | break; | 57 | break; |
58 | p = get_property(par, "dcr-parent", NULL); | 58 | p = of_get_property(par, "dcr-parent", NULL); |
59 | tmp = par; | 59 | tmp = par; |
60 | if (p == NULL) | 60 | if (p == NULL) |
61 | par = of_get_parent(par); | 61 | par = of_get_parent(par); |
@@ -80,13 +80,13 @@ u64 of_translate_dcr_address(struct device_node *dev, | |||
80 | return OF_BAD_ADDR; | 80 | return OF_BAD_ADDR; |
81 | 81 | ||
82 | /* Stride is not properly defined yet, default to 0x10 for Axon */ | 82 | /* Stride is not properly defined yet, default to 0x10 for Axon */ |
83 | p = get_property(dp, "dcr-mmio-stride", NULL); | 83 | p = of_get_property(dp, "dcr-mmio-stride", NULL); |
84 | stride = (p == NULL) ? 0x10 : *p; | 84 | stride = (p == NULL) ? 0x10 : *p; |
85 | 85 | ||
86 | /* XXX FIXME: Which property name is to use of the 2 following ? */ | 86 | /* XXX FIXME: Which property name is to use of the 2 following ? */ |
87 | p = get_property(dp, "dcr-mmio-range", NULL); | 87 | p = of_get_property(dp, "dcr-mmio-range", NULL); |
88 | if (p == NULL) | 88 | if (p == NULL) |
89 | p = get_property(dp, "dcr-mmio-space", NULL); | 89 | p = of_get_property(dp, "dcr-mmio-space", NULL); |
90 | if (p == NULL) | 90 | if (p == NULL) |
91 | return OF_BAD_ADDR; | 91 | return OF_BAD_ADDR; |
92 | 92 | ||