aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/iseries/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.c')
-rw-r--r--arch/powerpc/platforms/iseries/pci.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 35bcc98111f5..f4d427a7bb2d 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -176,12 +176,12 @@ void iSeries_pcibios_init(void)
176 } 176 }
177 while ((node = of_get_next_child(root, node)) != NULL) { 177 while ((node = of_get_next_child(root, node)) != NULL) {
178 HvBusNumber bus; 178 HvBusNumber bus;
179 u32 *busp; 179 const u32 *busp;
180 180
181 if ((node->type == NULL) || (strcmp(node->type, "pci") != 0)) 181 if ((node->type == NULL) || (strcmp(node->type, "pci") != 0))
182 continue; 182 continue;
183 183
184 busp = (u32 *)get_property(node, "bus-range", NULL); 184 busp = get_property(node, "bus-range", NULL);
185 if (busp == NULL) 185 if (busp == NULL)
186 continue; 186 continue;
187 bus = *busp; 187 bus = *busp;
@@ -221,10 +221,9 @@ void __init iSeries_pci_final_fixup(void)
221 221
222 if (node != NULL) { 222 if (node != NULL) {
223 struct pci_dn *pdn = PCI_DN(node); 223 struct pci_dn *pdn = PCI_DN(node);
224 u32 *agent; 224 const u32 *agent;
225 225
226 agent = (u32 *)get_property(node, "linux,agent-id", 226 agent = get_property(node, "linux,agent-id", NULL);
227 NULL);
228 if ((pdn != NULL) && (agent != NULL)) { 227 if ((pdn != NULL) && (agent != NULL)) {
229 u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, 228 u8 irq = iSeries_allocate_IRQ(pdn->busno, 0,
230 pdn->bussubno); 229 pdn->bussubno);