diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-29 04:50:16 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:55:37 -0400 |
commit | a165b4205e0097c7544ec3c59522a3b20ec14eb1 (patch) | |
tree | 6c4608555770b122c511d740f0180b796f75bf9b /arch/sparc64/kernel/pci_common.c | |
parent | f1cfdb55f16596752e8a61a8570a90ee26af183a (diff) |
[SPARC64]: Fix PCI rework to adhere to of_get_property() const return.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_common.c')
-rw-r--r-- | arch/sparc64/kernel/pci_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index 6b5c8e7a3eb0..1e6aeedf43c4 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c | |||
@@ -54,7 +54,7 @@ static void pci_register_legacy_regions(struct resource *io_res, | |||
54 | 54 | ||
55 | static void pci_register_iommu_region(struct pci_pbm_info *pbm) | 55 | static void pci_register_iommu_region(struct pci_pbm_info *pbm) |
56 | { | 56 | { |
57 | u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL); | 57 | const u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL); |
58 | 58 | ||
59 | if (vdma) { | 59 | if (vdma) { |
60 | struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL); | 60 | struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL); |
@@ -73,7 +73,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm) | |||
73 | 73 | ||
74 | void pci_determine_mem_io_space(struct pci_pbm_info *pbm) | 74 | void pci_determine_mem_io_space(struct pci_pbm_info *pbm) |
75 | { | 75 | { |
76 | struct linux_prom_pci_ranges *pbm_ranges; | 76 | const struct linux_prom_pci_ranges *pbm_ranges; |
77 | int i, saw_mem, saw_io; | 77 | int i, saw_mem, saw_io; |
78 | int num_pbm_ranges; | 78 | int num_pbm_ranges; |
79 | 79 | ||
@@ -82,7 +82,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) | |||
82 | num_pbm_ranges = i / sizeof(*pbm_ranges); | 82 | num_pbm_ranges = i / sizeof(*pbm_ranges); |
83 | 83 | ||
84 | for (i = 0; i < num_pbm_ranges; i++) { | 84 | for (i = 0; i < num_pbm_ranges; i++) { |
85 | struct linux_prom_pci_ranges *pr = &pbm_ranges[i]; | 85 | const struct linux_prom_pci_ranges *pr = &pbm_ranges[i]; |
86 | unsigned long a; | 86 | unsigned long a; |
87 | u32 parent_phys_hi, parent_phys_lo; | 87 | u32 parent_phys_hi, parent_phys_lo; |
88 | int type; | 88 | int type; |