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/iommu.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 'arch/powerpc/platforms/pseries/iommu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 4 |
1 files changed, 2 insertions, 2 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); |