diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
commit | a48141db68e4b9143759435badcc1a49d9022db4 (patch) | |
tree | a7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/mtd | |
parent | 0999ed7f57728c1919b131207e47d9b311cfbd74 (diff) |
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3,
which included changes which should go via other subsystem
maintainers.
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/physmap_of.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 72107dc06d67..7efe744ad31e 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
@@ -48,7 +48,7 @@ static int parse_flash_partitions(struct device_node *node, | |||
48 | const u32 *part; | 48 | const u32 *part; |
49 | const char *name; | 49 | const char *name; |
50 | 50 | ||
51 | part = of_get_property(node, "partitions", &plen); | 51 | part = get_property(node, "partitions", &plen); |
52 | if (part == NULL) | 52 | if (part == NULL) |
53 | goto err; | 53 | goto err; |
54 | 54 | ||
@@ -59,7 +59,7 @@ static int parse_flash_partitions(struct device_node *node, | |||
59 | goto err; | 59 | goto err; |
60 | } | 60 | } |
61 | 61 | ||
62 | name = of_get_property(node, "partition-names", &plen); | 62 | name = get_property(node, "partition-names", &plen); |
63 | 63 | ||
64 | for (i = 0; i < retval; i++) { | 64 | for (i = 0; i < retval; i++) { |
65 | (*parts)[i].offset = *part++; | 65 | (*parts)[i].offset = *part++; |
@@ -153,7 +153,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev | |||
153 | goto err_out; | 153 | goto err_out; |
154 | } | 154 | } |
155 | 155 | ||
156 | width = of_get_property(dp, "bank-width", NULL); | 156 | width = get_property(dp, "bank-width", NULL); |
157 | if (width == NULL) { | 157 | if (width == NULL) { |
158 | dev_err(&dev->dev, "Can't get the flash bank width!\n"); | 158 | dev_err(&dev->dev, "Can't get the flash bank width!\n"); |
159 | err = -EINVAL; | 159 | err = -EINVAL; |
@@ -174,7 +174,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev | |||
174 | 174 | ||
175 | simple_map_init(&info->map); | 175 | simple_map_init(&info->map); |
176 | 176 | ||
177 | of_probe = of_get_property(dp, "probe-type", NULL); | 177 | of_probe = get_property(dp, "probe-type", NULL); |
178 | if (of_probe == NULL) { | 178 | if (of_probe == NULL) { |
179 | probe_type = rom_probe_types; | 179 | probe_type = rom_probe_types; |
180 | for (; info->mtd == NULL && *probe_type != NULL; probe_type++) | 180 | for (; info->mtd == NULL && *probe_type != NULL; probe_type++) |