5 files changed, 12 insertions, 12 deletions

diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index f18eec6ad69..9ac9a307999 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)
 static int of_bus_pci_match(struct device_node *np)
 {
         if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) {
-                char *model = of_get_property(np, "model", NULL);
+                const char *model = of_get_property(np, "model", NULL);
 
                 if (model && !strcmp(model, "SUNW,simba"))
                         return 0;
@@ -339,7 +339,7 @@ static int of_bus_pci_match(struct device_node *np)
 
 static int of_bus_simba_match(struct device_node *np)
 {
-        char *model = of_get_property(np, "model", NULL);
+        const char *model = of_get_property(np, "model", NULL);
 
         if (model && !strcmp(model, "SUNW,simba"))
                 return 1;
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 8a7c699bb10..023af41ad68 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,
         ranges = of_get_property(node, "ranges", &len);
         simba = 0;
         if (ranges == NULL) {
-                char *model = of_get_property(node, "model", NULL);
+                const char *model = of_get_property(node, "model", NULL);
                 if (model && !strcmp(model, "SUNW,simba")) {
                         simba = 1;
                 } else {
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 6b5c8e7a3eb..1e6aeedf43c 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,
 
 static void pci_register_iommu_region(struct pci_pbm_info *pbm)
 {
-        u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL);
+        const u32 *vdma = of_get_property(pbm->prom_node, "virtual-dma", NULL);
 
         if (vdma) {
                 struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL);
@@ -73,7 +73,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm)
 
 void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
 {
-        struct linux_prom_pci_ranges *pbm_ranges;
+        const struct linux_prom_pci_ranges *pbm_ranges;
         int i, saw_mem, saw_io;
         int num_pbm_ranges;
 
@@ -82,7 +82,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
         num_pbm_ranges = i / sizeof(*pbm_ranges);
 
         for (i = 0; i < num_pbm_ranges; i++) {
-                struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
+                const struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
                 unsigned long a;
                 u32 parent_phys_hi, parent_phys_lo;
                 int type;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index a2f129d29c2..9a2ce0637c8 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
 
 void sabre_init(struct device_node *dp, char *model_name)
 {
-        struct linux_prom64_registers *pr_regs;
+        const struct linux_prom64_registers *pr_regs;
         struct pci_controller_info *p;
         struct pci_iommu *iommu;
         int tsbsize;
-        u32 *busrange;
-        u32 *vdma;
+        const u32 *busrange;
+        const u32 *vdma;
         u32 upa_portid, dma_mask;
         u64 clear_irq;
 
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 322cdbf50ef..47a5aa94dca 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,
                             struct device_node *dp, u32 portid,
                             int chip_type)
 {
-        struct linux_prom64_registers *regs;
-        unsigned int *busrange;
+        const struct linux_prom64_registers *regs;
+        const unsigned int *busrange;
         struct pci_pbm_info *pbm;
         const char *chipset_name;
-        u32 *ino_bitmap;
+        const u32 *ino_bitmap;
         int is_pbm_a;
 
         switch (chip_type) {