aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-03-29 04:50:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 04:55:37 -0400
commita165b4205e0097c7544ec3c59522a3b20ec14eb1 (patch)
tree6c4608555770b122c511d740f0180b796f75bf9b /arch
parentf1cfdb55f16596752e8a61a8570a90ee26af183a (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')
-rw-r--r--arch/sparc64/kernel/of_device.c4
-rw-r--r--arch/sparc64/kernel/pci.c2
-rw-r--r--arch/sparc64/kernel/pci_common.c6
-rw-r--r--arch/sparc64/kernel/pci_sabre.c6
-rw-r--r--arch/sparc64/kernel/pci_schizo.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index f18eec6ad691..9ac9a307999a 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -317,7 +317,7 @@ static unsigned int of_bus_default_get_flags(const u32 *addr)
317static int of_bus_pci_match(struct device_node *np) 317static int of_bus_pci_match(struct device_node *np)
318{ 318{
319 if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) { 319 if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
320 char *model = of_get_property(np, "model", NULL); 320 const char *model = of_get_property(np, "model", NULL);
321 321
322 if (model && !strcmp(model, "SUNW,simba")) 322 if (model && !strcmp(model, "SUNW,simba"))
323 return 0; 323 return 0;
@@ -339,7 +339,7 @@ static int of_bus_pci_match(struct device_node *np)
339 339
340static int of_bus_simba_match(struct device_node *np) 340static int of_bus_simba_match(struct device_node *np)
341{ 341{
342 char *model = of_get_property(np, "model", NULL); 342 const char *model = of_get_property(np, "model", NULL);
343 343
344 if (model && !strcmp(model, "SUNW,simba")) 344 if (model && !strcmp(model, "SUNW,simba"))
345 return 1; 345 return 1;
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 8a7c699bb109..023af41ad68d 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -551,7 +551,7 @@ void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
551 ranges = of_get_property(node, "ranges", &len); 551 ranges = of_get_property(node, "ranges", &len);
552 simba = 0; 552 simba = 0;
553 if (ranges == NULL) { 553 if (ranges == NULL) {
554 char *model = of_get_property(node, "model", NULL); 554 const char *model = of_get_property(node, "model", NULL);
555 if (model && !strcmp(model, "SUNW,simba")) { 555 if (model && !strcmp(model, "SUNW,simba")) {
556 simba = 1; 556 simba = 1;
557 } else { 557 } else {
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
55static void pci_register_iommu_region(struct pci_pbm_info *pbm) 55static 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
74void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 74void 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;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index a2f129d29c20..9a2ce0637c80 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1015,12 +1015,12 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
1015 1015
1016void sabre_init(struct device_node *dp, char *model_name) 1016void sabre_init(struct device_node *dp, char *model_name)
1017{ 1017{
1018 struct linux_prom64_registers *pr_regs; 1018 const struct linux_prom64_registers *pr_regs;
1019 struct pci_controller_info *p; 1019 struct pci_controller_info *p;
1020 struct pci_iommu *iommu; 1020 struct pci_iommu *iommu;
1021 int tsbsize; 1021 int tsbsize;
1022 u32 *busrange; 1022 const u32 *busrange;
1023 u32 *vdma; 1023 const u32 *vdma;
1024 u32 upa_portid, dma_mask; 1024 u32 upa_portid, dma_mask;
1025 u64 clear_irq; 1025 u64 clear_irq;
1026 1026
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 322cdbf50eff..47a5aa94dcae 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1490,11 +1490,11 @@ static void schizo_pbm_init(struct pci_controller_info *p,
1490 struct device_node *dp, u32 portid, 1490 struct device_node *dp, u32 portid,
1491 int chip_type) 1491 int chip_type)
1492{ 1492{
1493 struct linux_prom64_registers *regs; 1493 const struct linux_prom64_registers *regs;
1494 unsigned int *busrange; 1494 const unsigned int *busrange;
1495 struct pci_pbm_info *pbm; 1495 struct pci_pbm_info *pbm;
1496 const char *chipset_name; 1496 const char *chipset_name;
1497 u32 *ino_bitmap; 1497 const u32 *ino_bitmap;
1498 int is_pbm_a; 1498 int is_pbm_a;
1499 1499
1500 switch (chip_type) { 1500 switch (chip_type) {