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/platforms/pseries/iommu.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/platforms/pseries/iommu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index f9510a5a3e21..66665c82415c 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -253,8 +253,8 @@ static void iommu_table_setparms(struct pci_controller *phb, | |||
253 | 253 | ||
254 | node = (struct device_node *)phb->arch_data; | 254 | node = (struct device_node *)phb->arch_data; |
255 | 255 | ||
256 | basep = get_property(node, "linux,tce-base", NULL); | 256 | basep = of_get_property(node, "linux,tce-base", NULL); |
257 | sizep = get_property(node, "linux,tce-size", NULL); | 257 | sizep = of_get_property(node, "linux,tce-size", NULL); |
258 | if (basep == NULL || sizep == NULL) { | 258 | if (basep == NULL || sizep == NULL) { |
259 | printk(KERN_ERR "PCI_DMA: iommu_table_setparms: %s has " | 259 | printk(KERN_ERR "PCI_DMA: iommu_table_setparms: %s has " |
260 | "missing tce entries !\n", dn->full_name); | 260 | "missing tce entries !\n", dn->full_name); |
@@ -404,7 +404,7 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus) | |||
404 | 404 | ||
405 | /* Find nearest ibm,dma-window, walking up the device tree */ | 405 | /* Find nearest ibm,dma-window, walking up the device tree */ |
406 | for (pdn = dn; pdn != NULL; pdn = pdn->parent) { | 406 | for (pdn = dn; pdn != NULL; pdn = pdn->parent) { |
407 | dma_window = get_property(pdn, "ibm,dma-window", NULL); | 407 | dma_window = of_get_property(pdn, "ibm,dma-window", NULL); |
408 | if (dma_window != NULL) | 408 | if (dma_window != NULL) |
409 | break; | 409 | break; |
410 | } | 410 | } |
@@ -499,7 +499,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) | |||
499 | 499 | ||
500 | for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table; | 500 | for (pdn = dn; pdn && PCI_DN(pdn) && !PCI_DN(pdn)->iommu_table; |
501 | pdn = pdn->parent) { | 501 | pdn = pdn->parent) { |
502 | dma_window = get_property(pdn, "ibm,dma-window", NULL); | 502 | dma_window = of_get_property(pdn, "ibm,dma-window", NULL); |
503 | if (dma_window) | 503 | if (dma_window) |
504 | break; | 504 | break; |
505 | } | 505 | } |
@@ -548,7 +548,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti | |||
548 | switch (action) { | 548 | switch (action) { |
549 | case PSERIES_RECONFIG_REMOVE: | 549 | case PSERIES_RECONFIG_REMOVE: |
550 | if (pci && pci->iommu_table && | 550 | if (pci && pci->iommu_table && |
551 | get_property(np, "ibm,dma-window", NULL)) | 551 | of_get_property(np, "ibm,dma-window", NULL)) |
552 | iommu_free_table(np); | 552 | iommu_free_table(np); |
553 | break; | 553 | break; |
554 | default: | 554 | default: |
@@ -565,7 +565,7 @@ static struct notifier_block iommu_reconfig_nb = { | |||
565 | /* These are called very early. */ | 565 | /* These are called very early. */ |
566 | void iommu_init_early_pSeries(void) | 566 | void iommu_init_early_pSeries(void) |
567 | { | 567 | { |
568 | if (of_chosen && get_property(of_chosen, "linux,iommu-off", NULL)) { | 568 | if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) { |
569 | /* Direct I/O, IOMMU off */ | 569 | /* Direct I/O, IOMMU off */ |
570 | ppc_md.pci_dma_dev_setup = NULL; | 570 | ppc_md.pci_dma_dev_setup = NULL; |
571 | ppc_md.pci_dma_bus_setup = NULL; | 571 | ppc_md.pci_dma_bus_setup = NULL; |