diff options
Diffstat (limited to 'arch/powerpc/platforms/iseries')
-rw-r--r-- | arch/powerpc/platforms/iseries/iommu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/viopath.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 7df2902271d0..3b6a9666c2c0 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c | |||
@@ -171,7 +171,7 @@ void iommu_devnode_init_iSeries(struct pci_dev *pdev, struct device_node *dn) | |||
171 | { | 171 | { |
172 | struct iommu_table *tbl; | 172 | struct iommu_table *tbl; |
173 | struct pci_dn *pdn = PCI_DN(dn); | 173 | struct pci_dn *pdn = PCI_DN(dn); |
174 | const u32 *lsn = get_property(dn, "linux,logical-slot-number", NULL); | 174 | const u32 *lsn = of_get_property(dn, "linux,logical-slot-number", NULL); |
175 | 175 | ||
176 | BUG_ON(lsn == NULL); | 176 | BUG_ON(lsn == NULL); |
177 | 177 | ||
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 404cf0696857..9c974227155e 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c | |||
@@ -176,7 +176,7 @@ void __init iSeries_pci_final_fixup(void) | |||
176 | struct pci_dn *pdn = PCI_DN(node); | 176 | struct pci_dn *pdn = PCI_DN(node); |
177 | const u32 *agent; | 177 | const u32 *agent; |
178 | 178 | ||
179 | agent = get_property(node, "linux,agent-id", NULL); | 179 | agent = of_get_property(node, "linux,agent-id", NULL); |
180 | if ((pdn != NULL) && (agent != NULL)) { | 180 | if ((pdn != NULL) && (agent != NULL)) { |
181 | u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, | 181 | u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, |
182 | pdn->bussubno); | 182 | pdn->bussubno); |
@@ -754,7 +754,7 @@ void __init iSeries_pcibios_init(void) | |||
754 | if ((node->type == NULL) || (strcmp(node->type, "pci") != 0)) | 754 | if ((node->type == NULL) || (strcmp(node->type, "pci") != 0)) |
755 | continue; | 755 | continue; |
756 | 756 | ||
757 | busp = get_property(node, "bus-range", NULL); | 757 | busp = of_get_property(node, "bus-range", NULL); |
758 | if (busp == NULL) | 758 | if (busp == NULL) |
759 | continue; | 759 | continue; |
760 | bus = *busp; | 760 | bus = *busp; |
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c index e2100ece9c65..2ca2d8a9de97 100644 --- a/arch/powerpc/platforms/iseries/viopath.c +++ b/arch/powerpc/platforms/iseries/viopath.c | |||
@@ -155,7 +155,7 @@ static int proc_viopath_show(struct seq_file *m, void *v) | |||
155 | node = of_find_node_by_path("/"); | 155 | node = of_find_node_by_path("/"); |
156 | sysid = NULL; | 156 | sysid = NULL; |
157 | if (node != NULL) | 157 | if (node != NULL) |
158 | sysid = get_property(node, "system-id", NULL); | 158 | sysid = of_get_property(node, "system-id", NULL); |
159 | 159 | ||
160 | if (sysid == NULL) | 160 | if (sysid == NULL) |
161 | seq_printf(m, "SRLNBR=<UNKNOWN>\n"); | 161 | seq_printf(m, "SRLNBR=<UNKNOWN>\n"); |