diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 00:51:41 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 19:41:12 -0400 |
commit | cfa0652c4eb4ca37f88fcdd7d871cf98d9d98c0e (patch) | |
tree | 14a3278bd62870a1b0a8fb3ba709fd2f3f3257ee /arch/sparc64/kernel/pci_fire.c | |
parent | 36f021b579d195cdc5fa6f3e2bab198b4bf70643 (diff) |
[SPARC64] PCI: Use common routine to fetch PBM properties.
Namely bus-range and ino-bitmap.
This allows us also to eliminate pci_controller_info's
pci_{first,last}_busno fields as only the pbm ones are
used now.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_fire.c')
-rw-r--r-- | arch/sparc64/kernel/pci_fire.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c index 0fe626631e12..79ee5be948eb 100644 --- a/arch/sparc64/kernel/pci_fire.c +++ b/arch/sparc64/kernel/pci_fire.c | |||
@@ -317,8 +317,6 @@ static void pci_fire_pbm_init(struct pci_controller_info *p, | |||
317 | { | 317 | { |
318 | const struct linux_prom64_registers *regs; | 318 | const struct linux_prom64_registers *regs; |
319 | struct pci_pbm_info *pbm; | 319 | struct pci_pbm_info *pbm; |
320 | const u32 *ino_bitmap; | ||
321 | const unsigned int *busrange; | ||
322 | 320 | ||
323 | if ((portid & 1) == 0) | 321 | if ((portid & 1) == 0) |
324 | pbm = &p->pbm_A; | 322 | pbm = &p->pbm_A; |
@@ -338,13 +336,7 @@ static void pci_fire_pbm_init(struct pci_controller_info *p, | |||
338 | 336 | ||
339 | pci_determine_mem_io_space(pbm); | 337 | pci_determine_mem_io_space(pbm); |
340 | 338 | ||
341 | ino_bitmap = of_get_property(dp, "ino-bitmap", NULL); | 339 | pci_get_pbm_props(pbm); |
342 | pbm->ino_bitmap = (((u64)ino_bitmap[1] << 32UL) | | ||
343 | ((u64)ino_bitmap[0] << 0UL)); | ||
344 | |||
345 | busrange = of_get_property(dp, "bus-range", NULL); | ||
346 | pbm->pci_first_busno = busrange[0]; | ||
347 | pbm->pci_last_busno = busrange[1]; | ||
348 | 340 | ||
349 | pci_fire_hw_init(pbm); | 341 | pci_fire_hw_init(pbm); |
350 | pci_fire_pbm_iommu_init(pbm); | 342 | pci_fire_pbm_iommu_init(pbm); |