diff options
author | Nathan Fontenot <nfont@linux.vnet.ibm.com> | 2012-10-02 12:58:46 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 20:56:52 -0500 |
commit | 79d1c712958f94372482ad74578b00f44e744c12 (patch) | |
tree | ed26a9e56c56502c6f30496e7cbc367b54d950e7 /drivers/of/base.c | |
parent | 1cf3d8b3d24cd383ddfd5442c83ec5c355ffc2f7 (diff) |
powerpc+of: Rename the drivers/of prom_* functions to of_*
Rename the prom_*_property routines of the generic OF code to of_*_property.
This brings them in line with the naming used by the rest of the OF code.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/of/base.c')
-rw-r--r-- | drivers/of/base.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 87b63850e8dc..02d94c4ea83c 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
@@ -1047,9 +1047,9 @@ static int of_property_notify(int action, struct device_node *np, | |||
1047 | #endif | 1047 | #endif |
1048 | 1048 | ||
1049 | /** | 1049 | /** |
1050 | * prom_add_property - Add a property to a node | 1050 | * of_add_property - Add a property to a node |
1051 | */ | 1051 | */ |
1052 | int prom_add_property(struct device_node *np, struct property *prop) | 1052 | int of_add_property(struct device_node *np, struct property *prop) |
1053 | { | 1053 | { |
1054 | struct property **next; | 1054 | struct property **next; |
1055 | unsigned long flags; | 1055 | unsigned long flags; |
@@ -1083,14 +1083,14 @@ int prom_add_property(struct device_node *np, struct property *prop) | |||
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | /** | 1085 | /** |
1086 | * prom_remove_property - Remove a property from a node. | 1086 | * of_remove_property - Remove a property from a node. |
1087 | * | 1087 | * |
1088 | * Note that we don't actually remove it, since we have given out | 1088 | * Note that we don't actually remove it, since we have given out |
1089 | * who-knows-how-many pointers to the data using get-property. | 1089 | * who-knows-how-many pointers to the data using get-property. |
1090 | * Instead we just move the property to the "dead properties" | 1090 | * Instead we just move the property to the "dead properties" |
1091 | * list, so it won't be found any more. | 1091 | * list, so it won't be found any more. |
1092 | */ | 1092 | */ |
1093 | int prom_remove_property(struct device_node *np, struct property *prop) | 1093 | int of_remove_property(struct device_node *np, struct property *prop) |
1094 | { | 1094 | { |
1095 | struct property **next; | 1095 | struct property **next; |
1096 | unsigned long flags; | 1096 | unsigned long flags; |
@@ -1129,7 +1129,7 @@ int prom_remove_property(struct device_node *np, struct property *prop) | |||
1129 | } | 1129 | } |
1130 | 1130 | ||
1131 | /* | 1131 | /* |
1132 | * prom_update_property - Update a property in a node, if the property does | 1132 | * of_update_property - Update a property in a node, if the property does |
1133 | * not exist, add it. | 1133 | * not exist, add it. |
1134 | * | 1134 | * |
1135 | * Note that we don't actually remove it, since we have given out | 1135 | * Note that we don't actually remove it, since we have given out |
@@ -1137,8 +1137,7 @@ int prom_remove_property(struct device_node *np, struct property *prop) | |||
1137 | * Instead we just move the property to the "dead properties" list, | 1137 | * Instead we just move the property to the "dead properties" list, |
1138 | * and add the new property to the property list | 1138 | * and add the new property to the property list |
1139 | */ | 1139 | */ |
1140 | int prom_update_property(struct device_node *np, | 1140 | int of_update_property(struct device_node *np, struct property *newprop) |
1141 | struct property *newprop) | ||
1142 | { | 1141 | { |
1143 | struct property **next, *oldprop; | 1142 | struct property **next, *oldprop; |
1144 | unsigned long flags; | 1143 | unsigned long flags; |
@@ -1153,7 +1152,7 @@ int prom_update_property(struct device_node *np, | |||
1153 | 1152 | ||
1154 | oldprop = of_find_property(np, newprop->name, NULL); | 1153 | oldprop = of_find_property(np, newprop->name, NULL); |
1155 | if (!oldprop) | 1154 | if (!oldprop) |
1156 | return prom_add_property(np, newprop); | 1155 | return of_add_property(np, newprop); |
1157 | 1156 | ||
1158 | write_lock_irqsave(&devtree_lock, flags); | 1157 | write_lock_irqsave(&devtree_lock, flags); |
1159 | next = &np->properties; | 1158 | next = &np->properties; |