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/tsi108_dev.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/tsi108_dev.c')
-rw-r--r-- | arch/powerpc/sysdev/tsi108_dev.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c index 97f37ef4bbbf..337039ee51e6 100644 --- a/arch/powerpc/sysdev/tsi108_dev.c +++ b/arch/powerpc/sysdev/tsi108_dev.c | |||
@@ -48,7 +48,7 @@ phys_addr_t get_csrbase(void) | |||
48 | tsi = of_find_node_by_type(NULL, "tsi-bridge"); | 48 | tsi = of_find_node_by_type(NULL, "tsi-bridge"); |
49 | if (tsi) { | 49 | if (tsi) { |
50 | unsigned int size; | 50 | unsigned int size; |
51 | const void *prop = get_property(tsi, "reg", &size); | 51 | const void *prop = of_get_property(tsi, "reg", &size); |
52 | tsi108_csr_base = of_translate_address(tsi, prop); | 52 | tsi108_csr_base = of_translate_address(tsi, prop); |
53 | of_node_put(tsi); | 53 | of_node_put(tsi); |
54 | }; | 54 | }; |
@@ -77,10 +77,10 @@ static int __init tsi108_eth_of_init(void) | |||
77 | struct resource r[2]; | 77 | struct resource r[2]; |
78 | struct device_node *phy; | 78 | struct device_node *phy; |
79 | hw_info tsi_eth_data; | 79 | hw_info tsi_eth_data; |
80 | unsigned int *id; | 80 | const unsigned int *id; |
81 | unsigned int *phy_id; | 81 | const unsigned int *phy_id; |
82 | const void *mac_addr; | 82 | const void *mac_addr; |
83 | phandle *ph; | 83 | const phandle *ph; |
84 | 84 | ||
85 | memset(r, 0, sizeof(r)); | 85 | memset(r, 0, sizeof(r)); |
86 | memset(&tsi_eth_data, 0, sizeof(tsi_eth_data)); | 86 | memset(&tsi_eth_data, 0, sizeof(tsi_eth_data)); |
@@ -107,10 +107,10 @@ static int __init tsi108_eth_of_init(void) | |||
107 | goto err; | 107 | goto err; |
108 | } | 108 | } |
109 | 109 | ||
110 | mac_addr = get_property(np, "address", NULL); | 110 | mac_addr = of_get_property(np, "address", NULL); |
111 | memcpy(tsi_eth_data.mac_addr, mac_addr, 6); | 111 | memcpy(tsi_eth_data.mac_addr, mac_addr, 6); |
112 | 112 | ||
113 | ph = (phandle *) get_property(np, "phy-handle", NULL); | 113 | ph = of_get_property(np, "phy-handle", NULL); |
114 | phy = of_find_node_by_phandle(*ph); | 114 | phy = of_find_node_by_phandle(*ph); |
115 | 115 | ||
116 | if (phy == NULL) { | 116 | if (phy == NULL) { |
@@ -118,8 +118,8 @@ static int __init tsi108_eth_of_init(void) | |||
118 | goto unreg; | 118 | goto unreg; |
119 | } | 119 | } |
120 | 120 | ||
121 | id = (u32 *) get_property(phy, "reg", NULL); | 121 | id = of_get_property(phy, "reg", NULL); |
122 | phy_id = (u32 *) get_property(phy, "phy-id", NULL); | 122 | phy_id = of_get_property(phy, "phy-id", NULL); |
123 | ret = of_address_to_resource(phy, 0, &res); | 123 | ret = of_address_to_resource(phy, 0, &res); |
124 | if (ret) { | 124 | if (ret) { |
125 | of_node_put(phy); | 125 | of_node_put(phy); |