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 /arch/powerpc/platforms/pseries | |
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 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/mobility.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index da5594c441e4..e2685badb5db 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -760,7 +760,7 @@ static void remove_ddw(struct device_node *np) | |||
760 | __remove_ddw(np, ddw_avail, liobn); | 760 | __remove_ddw(np, ddw_avail, liobn); |
761 | 761 | ||
762 | delprop: | 762 | delprop: |
763 | ret = prom_remove_property(np, win64); | 763 | ret = of_remove_property(np, win64); |
764 | if (ret) | 764 | if (ret) |
765 | pr_warning("%s: failed to remove direct window property: %d\n", | 765 | pr_warning("%s: failed to remove direct window property: %d\n", |
766 | np->full_name, ret); | 766 | np->full_name, ret); |
@@ -1070,7 +1070,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn) | |||
1070 | goto out_free_window; | 1070 | goto out_free_window; |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | ret = prom_add_property(pdn, win64); | 1073 | ret = of_add_property(pdn, win64); |
1074 | if (ret) { | 1074 | if (ret) { |
1075 | dev_err(&dev->dev, "unable to add dma window property for %s: %d", | 1075 | dev_err(&dev->dev, "unable to add dma window property for %s: %d", |
1076 | pdn->full_name, ret); | 1076 | pdn->full_name, ret); |
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index dd30b12edfe4..6573808cc5f3 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c | |||
@@ -116,7 +116,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop, | |||
116 | } | 116 | } |
117 | 117 | ||
118 | if (!more) { | 118 | if (!more) { |
119 | prom_update_property(dn, new_prop); | 119 | of_update_property(dn, new_prop); |
120 | new_prop = NULL; | 120 | new_prop = NULL; |
121 | } | 121 | } |
122 | 122 | ||
@@ -172,7 +172,7 @@ static int update_dt_node(u32 phandle) | |||
172 | 172 | ||
173 | case 0x80000000: | 173 | case 0x80000000: |
174 | prop = of_find_property(dn, prop_name, NULL); | 174 | prop = of_find_property(dn, prop_name, NULL); |
175 | prom_remove_property(dn, prop); | 175 | of_remove_property(dn, prop); |
176 | prop = NULL; | 176 | prop = NULL; |
177 | break; | 177 | break; |
178 | 178 | ||
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 720a0cc2e69f..30b358dc2beb 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c | |||
@@ -326,7 +326,7 @@ static int do_add_property(char *buf, size_t bufsize) | |||
326 | if (!prop) | 326 | if (!prop) |
327 | return -ENOMEM; | 327 | return -ENOMEM; |
328 | 328 | ||
329 | prom_add_property(np, prop); | 329 | of_add_property(np, prop); |
330 | 330 | ||
331 | return 0; | 331 | return 0; |
332 | } | 332 | } |
@@ -350,7 +350,7 @@ static int do_remove_property(char *buf, size_t bufsize) | |||
350 | 350 | ||
351 | prop = of_find_property(np, buf, NULL); | 351 | prop = of_find_property(np, buf, NULL); |
352 | 352 | ||
353 | return prom_remove_property(np, prop); | 353 | return of_remove_property(np, prop); |
354 | } | 354 | } |
355 | 355 | ||
356 | static int do_update_property(char *buf, size_t bufsize) | 356 | static int do_update_property(char *buf, size_t bufsize) |
@@ -380,7 +380,7 @@ static int do_update_property(char *buf, size_t bufsize) | |||
380 | if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size")) | 380 | if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size")) |
381 | slb_set_size(*(int *)value); | 381 | slb_set_size(*(int *)value); |
382 | 382 | ||
383 | return prom_update_property(np, newprop); | 383 | return of_update_property(np, newprop); |
384 | } | 384 | } |
385 | 385 | ||
386 | /** | 386 | /** |