1 files changed, 21 insertions, 18 deletions

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 0917c24c4f08..5e1fcd05160d 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -36,12 +36,13 @@ static struct device_node *allnodes;
  */
 static DEFINE_RWLOCK(devtree_lock);
 
-int of_device_is_compatible(struct device_node *device, const char *compat)
+int of_device_is_compatible(const struct device_node *device,
+                            const char *compat)
 {
         const char* cp;
         int cplen, l;
 
-        cp = (char *) of_get_property(device, "compatible", &cplen);
+        cp = of_get_property(device, "compatible", &cplen);
         if (cp == NULL)
                 return 0;
         while (cplen > 0) {
@@ -154,13 +155,14 @@ struct device_node *of_find_compatible_node(struct device_node *from,
 }
 EXPORT_SYMBOL(of_find_compatible_node);
 
-struct property *of_find_property(struct device_node *np, const char *name,
+struct property *of_find_property(const struct device_node *np,
+                                  const char *name,
                                   int *lenp)
 {
         struct property *pp;
 
         for (pp = np->properties; pp != 0; pp = pp->next) {
-                if (strcmp(pp->name, name) == 0) {
+                if (strcasecmp(pp->name, name) == 0) {
                         if (lenp != 0)
                                 *lenp = pp->length;
                         break;
@@ -174,7 +176,8 @@ EXPORT_SYMBOL(of_find_property);
  * Find a property with a given name for a given node
  * and return the value.
  */
-void *of_get_property(struct device_node *np, const char *name, int *lenp)
+const void *of_get_property(const struct device_node *np, const char *name,
+                      int *lenp)
 {
         struct property *pp = of_find_property(np,name,lenp);
         return pp ? pp->value : NULL;
@@ -196,7 +199,7 @@ EXPORT_SYMBOL(of_getintprop_default);
 
 int of_n_addr_cells(struct device_node *np)
 {
-        int* ip;
+        const int* ip;
         do {
                 if (np->parent)
                         np = np->parent;
@@ -211,7 +214,7 @@ EXPORT_SYMBOL(of_n_addr_cells);
 
 int of_n_size_cells(struct device_node *np)
 {
-        int* ip;
+        const int* ip;
         do {
                 if (np->parent)
                         np = np->parent;
@@ -243,7 +246,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len
         while (*prevp) {
                 struct property *prop = *prevp;
 
-                if (!strcmp(prop->name, name)) {
+                if (!strcasecmp(prop->name, name)) {
                         void *old_val = prop->value;
                         int ret;
 
@@ -397,7 +400,7 @@ static unsigned int psycho_irq_build(struct device_node *dp,
 
 static void psycho_irq_trans_init(struct device_node *dp)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = psycho_irq_build;
@@ -547,7 +550,7 @@ static unsigned long __sabre_onboard_imap_off[] = {
 static int sabre_device_needs_wsync(struct device_node *dp)
 {
         struct device_node *parent = dp->parent;
-        char *parent_model, *parent_compat;
+        const char *parent_model, *parent_compat;
 
         /* This traversal up towards the root is meant to
          * handle two cases:
@@ -589,7 +592,7 @@ static unsigned int sabre_irq_build(struct device_node *dp,
 {
         struct sabre_irq_data *irq_data = _data;
         unsigned long controller_regs = irq_data->controller_regs;
-        struct linux_prom_pci_registers *regs;
+        const struct linux_prom_pci_registers *regs;
         unsigned long imap, iclr;
         unsigned long imap_off, iclr_off;
         int inofixup = 0;
@@ -639,9 +642,9 @@ static unsigned int sabre_irq_build(struct device_node *dp,
 
 static void sabre_irq_trans_init(struct device_node *dp)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
         struct sabre_irq_data *irq_data;
-        u32 *busrange;
+        const u32 *busrange;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = sabre_irq_build;
@@ -795,7 +798,7 @@ static unsigned int schizo_irq_build(struct device_node *dp,
 
 static void __schizo_irq_trans_init(struct device_node *dp, int is_tomatillo)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
         struct schizo_irq_data *irq_data;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
@@ -836,7 +839,7 @@ static unsigned int pci_sun4v_irq_build(struct device_node *dp,
 
 static void pci_sun4v_irq_trans_init(struct device_node *dp)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = pci_sun4v_irq_build;
@@ -940,7 +943,7 @@ static unsigned int sbus_of_build_irq(struct device_node *dp,
                                       void *_data)
 {
         unsigned long reg_base = (unsigned long) _data;
-        struct linux_prom_registers *regs;
+        const struct linux_prom_registers *regs;
         unsigned long imap, iclr;
         int sbus_slot = 0;
         int sbus_level = 0;
@@ -994,7 +997,7 @@ static unsigned int sbus_of_build_irq(struct device_node *dp,
 
 static void sbus_irq_trans_init(struct device_node *dp)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = sbus_of_build_irq;
@@ -1080,7 +1083,7 @@ static unsigned int sun4v_vdev_irq_build(struct device_node *dp,
 
 static void sun4v_vdev_irq_trans_init(struct device_node *dp)
 {
-        struct linux_prom64_registers *regs;
+        const struct linux_prom64_registers *regs;
 
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = sun4v_vdev_irq_build;