10 files changed, 64 insertions, 67 deletions

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index f6686fcce809..0897b0c8d528 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -928,7 +928,7 @@ static int __init rtc_init(void)
 #ifdef __sparc__
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if(strcmp(edev->prom_name, "rtc") == 0) {
+                        if(strcmp(edev->prom_node->name, "rtc") == 0) {
                                 rtc_port = edev->resource[0].start;
                                 rtc_irq = edev->irqs[0];
                                 goto found;
@@ -938,7 +938,7 @@ static int __init rtc_init(void)
 #ifdef __sparc_v9__
         for_each_isa(isa_br) {
                 for_each_isadev(isa_dev, isa_br) {
-                        if (strcmp(isa_dev->prom_name, "rtc") == 0) {
+                        if (strcmp(isa_dev->prom_node->name, "rtc") == 0) {
                                 rtc_port = isa_dev->resource.start;
                                 rtc_irq = isa_dev->irq;
                                 goto found;
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index f0fd2c4740f1..ed95dc9420dd 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -199,7 +199,7 @@ static int __init sparcspkr_init(void)
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "beep")) {
+                        if (!strcmp(edev->prom_node->name, "beep")) {
                                 beep_name = "Sparc EBUS Speaker";
                                 beep_event = ebus_spkr_event;
                                 beep_iobase = edev->resource[0].start;
@@ -213,7 +213,7 @@ static int __init sparcspkr_init(void)
                         /* A hack, the beep device's base lives in
                          * the DMA isa node.
                          */
-                        if (!strcmp(isa_dev->prom_name, "dma")) {
+                        if (!strcmp(isa_dev->prom_node->name, "dma")) {
                                 beep_name = "Sparc ISA Speaker";
                                 beep_event = isa_spkr_event,
                                 beep_iobase = isa_dev->resource.start;
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index ed9446f6d7e3..6d66351805a2 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -74,7 +74,7 @@ static int __init i8042_platform_init(void)
 
                 for_each_ebus(ebus) {
                         for_each_ebusdev(edev, ebus) {
-                                if (!strcmp(edev->prom_name, "8042"))
+                                if (!strcmp(edev->prom_node->name, "8042"))
                                         goto edev_found;
                         }
                 }
@@ -82,14 +82,14 @@ static int __init i8042_platform_init(void)
 
         edev_found:
                 for_each_edevchild(edev, child) {
-                        if (!strcmp(child->prom_name, OBP_PS2KBD_NAME1) ||
-                            !strcmp(child->prom_name, OBP_PS2KBD_NAME2)) {
+                        if (!strcmp(child->prom_node->name, OBP_PS2KBD_NAME1) ||
+                            !strcmp(child->prom_node->name, OBP_PS2KBD_NAME2)) {
                                 i8042_kbd_irq = child->irqs[0];
                                 kbd_iobase =
                                         ioremap(child->resource[0].start, 8);
                         }
-                        if (!strcmp(child->prom_name, OBP_PS2MS_NAME1) ||
-                            !strcmp(child->prom_name, OBP_PS2MS_NAME2))
+                        if (!strcmp(child->prom_node->name, OBP_PS2MS_NAME1) ||
+                            !strcmp(child->prom_node->name, OBP_PS2MS_NAME2))
                                 i8042_aux_irq = child->irqs[0];
                 }
                 if (i8042_kbd_irq == -1 ||
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index d89f83f769f5..1cc706e11119 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -575,9 +575,9 @@ int bbc_envctrl_init(void)
         int devidx = 0;
 
         while ((echild = bbc_i2c_getdev(devidx++)) != NULL) {
-                if (!strcmp(echild->prom_name, "temperature"))
+                if (!strcmp(echild->prom_node->name, "temperature"))
                         attach_one_temp(echild, temp_index++);
-                if (!strcmp(echild->prom_name, "fan-control"))
+                if (!strcmp(echild->prom_node->name, "fan-control"))
                         attach_one_fan(echild, fan_index++);
         }
         if (temp_index != 0 && fan_index != 0) {
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 3e156e005f2e..73634371393b 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -423,7 +423,7 @@ static int __init bbc_present(void)
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "bbc"))
+                        if (!strcmp(edev->prom_node->name, "bbc"))
                                 return 1;
                 }
         }
@@ -446,7 +446,7 @@ static int __init bbc_i2c_init(void)
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "i2c")) {
+                        if (!strcmp(edev->prom_node->name, "i2c")) {
                                 if (!attach_one_i2c(edev, index))
                                         index++;
                         }
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index c3a51d1fae5d..d92bc8827a9e 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -184,7 +184,7 @@ static int __init d7s_init(void)
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, D7S_OBPNAME))
+                        if (!strcmp(edev->prom_node->name, D7S_OBPNAME))
                                 goto ebus_done;
                 }
         }
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 19e8eddf887a..cf97e9efe9b6 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -768,16 +768,14 @@ static void envctrl_set_mon(struct i2c_child_t *pchild,
  *                       decoding tables, monitor type, optional properties.
  * Return: None.
  */
-static void envctrl_init_adc(struct i2c_child_t *pchild, int node)
+static void envctrl_init_adc(struct i2c_child_t *pchild, struct device_node *dp)
 {
-        char chnls_desc[CHANNEL_DESC_SZ];
         int i = 0, len;
-        char *pos = chnls_desc;
+        char *pos;
+        unsigned int *pval;
 
         /* Firmware describe channels into a stream separated by a '\0'. */
-        len = prom_getproperty(node, "channels-description", chnls_desc,
-                               CHANNEL_DESC_SZ);
-        chnls_desc[CHANNEL_DESC_SZ - 1] = '\0';
+        pos = of_get_property(dp, "channels-description", &len);
 
         while (len > 0) {
                 int l = strlen(pos) + 1;
@@ -787,10 +785,13 @@ static void envctrl_init_adc(struct i2c_child_t *pchild, int node)
         }
 
         /* Get optional properties. */
-        len = prom_getproperty(node, "warning-temp", (char *)&warning_temperature,
-                               sizeof(warning_temperature));
-        len = prom_getproperty(node, "shutdown-temp", (char *)&shutdown_temperature,
-                               sizeof(shutdown_temperature));
+        pval = of_get_property(dp, "warning-temp", NULL);
+        if (pval)
+                warning_temperature = *pval;
+
+        pval = of_get_property(dp, "shutdown-temp", NULL);
+        if (pval)
+                shutdown_temperature = *pval;
 }
 
 /* Function Description: Initialize child device monitoring fan status.
@@ -864,21 +865,18 @@ static void envctrl_init_voltage_status(struct i2c_child_t *pchild)
 static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
                                    struct i2c_child_t *pchild)
 {
-        int node, len, i, tbls_size = 0;
-
-        node = edev_child->prom_node;
+        int len, i, tbls_size = 0;
+        struct device_node *dp = edev_child->prom_node;
+        void *pval;
 
         /* Get device address. */
-        len = prom_getproperty(node, "reg",
-                               (char *) &(pchild->addr),
-                               sizeof(pchild->addr));
+        pval = of_get_property(dp, "reg", &len);
+        memcpy(&pchild->addr, pval, len);
 
         /* Get tables property.  Read firmware temperature tables. */
-        len = prom_getproperty(node, "translation",
-                               (char *) pchild->tblprop_array,
-                               (PCF8584_MAX_CHANNELS *
-                                sizeof(struct pcf8584_tblprop)));
-        if (len > 0) {
+        pval = of_get_property(dp, "translation", &len);
+        if (pval && len > 0) {
+                memcpy(pchild->tblprop_array, pval, len);
                 pchild->total_tbls = len / sizeof(struct pcf8584_tblprop);
                 for (i = 0; i < pchild->total_tbls; i++) {
                         if ((pchild->tblprop_array[i].size + pchild->tblprop_array[i].offset) > tbls_size) {
@@ -891,12 +889,12 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
                         printk("envctrl: Failed to allocate table.\n");
                         return;
                 }
-                len = prom_getproperty(node, "tables",
-                                       (char *) pchild->tables, tbls_size);
-                if (len <= 0) {
+                pval = of_get_property(dp, "tables", &len);
+                if (!pval || len <= 0) {
                         printk("envctrl: Failed to get table.\n");
                         return;
                 }
+                memcpy(pchild->tables, pval, len);
         }
 
         /* SPARCengine ASM Reference Manual (ref. SMI doc 805-7581-04)
@@ -907,12 +905,11 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
          * 'NULL' monitor type.
          */
         if (ENVCTRL_CPCI_IGNORED_NODE == pchild->addr) {
+                struct device_node *root_node;
                 int len;
-                char prop[56];
 
-                len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));
-                if (0 < len && (0 == strncmp(prop, "SUNW,UltraSPARC-IIi-cEngine", len)))
-                {
+                root_node = of_find_node_by_path("/");
+                if (!strcmp(root_node->name, "SUNW,UltraSPARC-IIi-cEngine")) {
                         for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) {
                                 pchild->mon_type[len] = ENVCTRL_NOMON;
                         }
@@ -921,16 +918,14 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
         }
 
         /* Get the monitor channels. */
-        len = prom_getproperty(node, "channels-in-use",
-                               (char *) pchild->chnl_array,
-                               (PCF8584_MAX_CHANNELS *
-                                sizeof(struct pcf8584_channel)));
+        pval = of_get_property(dp, "channels-in-use", &len);
+        memcpy(pchild->chnl_array, pval, len);
         pchild->total_chnls = len / sizeof(struct pcf8584_channel);
 
         for (i = 0; i < pchild->total_chnls; i++) {
                 switch (pchild->chnl_array[i].type) {
                 case PCF8584_TEMP_TYPE:
-                        envctrl_init_adc(pchild, node);
+                        envctrl_init_adc(pchild, dp);
                         break;
 
                 case PCF8584_GLOBALADDR_TYPE:
@@ -945,7 +940,7 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
 
                 case PCF8584_VOLTAGE_TYPE:
                         if (pchild->i2ctype == I2C_ADC) {
-                                envctrl_init_adc(pchild,node);
+                                envctrl_init_adc(pchild,dp);
                         } else {
                                 envctrl_init_voltage_status(pchild);
                         }
@@ -1046,7 +1041,7 @@ static int __init envctrl_init(void)
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "bbc")) {
+                        if (!strcmp(edev->prom_node->name, "bbc")) {
                                 /* If we find a boot-bus controller node,
                                  * then this envctrl driver is not for us.
                                  */
@@ -1060,14 +1055,14 @@ static int __init envctrl_init(void)
          */
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "i2c")) {
+                        if (!strcmp(edev->prom_node->name, "i2c")) {
                                 i2c = ioremap(edev->resource[0].start, 0x2);
                                 for_each_edevchild(edev, edev_child) {
-                                        if (!strcmp("gpio", edev_child->prom_name)) {
+                                        if (!strcmp("gpio", edev_child->prom_node->name)) {
                                                 i2c_childlist[i].i2ctype = I2C_GPIO;
                                                 envctrl_init_i2c_child(edev_child, &(i2c_childlist[i++]));
                                         }
-                                        if (!strcmp("adc", edev_child->prom_name)) {
+                                        if (!strcmp("adc", edev_child->prom_node->name)) {
                                                 i2c_childlist[i].i2ctype = I2C_ADC;
                                                 envctrl_init_i2c_child(edev_child, &(i2c_childlist[i++]));
                                         }
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 2beb3dded087..5ae684c011f8 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -192,9 +192,11 @@ static int __init flash_init(void)
         }
         if (!sdev) {
 #ifdef CONFIG_PCI
+                struct linux_prom_registers *ebus_regs;
+
                 for_each_ebus(ebus) {
                         for_each_ebusdev(edev, ebus) {
-                                if (!strcmp(edev->prom_name, "flashprom"))
+                                if (!strcmp(edev->prom_node->name, "flashprom"))
                                         goto ebus_done;
                         }
                 }
@@ -202,23 +204,23 @@ static int __init flash_init(void)
                 if (!edev)
                         return -ENODEV;
 
-                len = prom_getproperty(edev->prom_node, "reg", (void *)regs, sizeof(regs));
-                if ((len % sizeof(regs[0])) != 0) {
+                ebus_regs = of_get_property(edev->prom_node, "reg", &len);
+                if (!ebus_regs || (len % sizeof(regs[0])) != 0) {
                         printk("flash: Strange reg property size %d\n", len);
                         return -ENODEV;
                 }
 
-                nregs = len / sizeof(regs[0]);
+                nregs = len / sizeof(ebus_regs[0]);
 
                 flash.read_base = edev->resource[0].start;
-                flash.read_size = regs[0].reg_size;
+                flash.read_size = ebus_regs[0].reg_size;
 
                 if (nregs == 1) {
                         flash.write_base = edev->resource[0].start;
-                        flash.write_size = regs[0].reg_size;
+                        flash.write_size = ebus_regs[0].reg_size;
                 } else if (nregs == 2) {
                         flash.write_base = edev->resource[1].start;
-                        flash.write_size = regs[1].reg_size;
+                        flash.write_size = ebus_regs[1].reg_size;
                 } else {
                         printk("flash: Strange number of regs %d\n", nregs);
                         return -ENODEV;
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index bfbe9dc90cca..e4c0fd2d6a9d 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -984,19 +984,19 @@ static void __init for_each_sab_edev(void (*callback)(struct linux_ebus_device *
 
         for_each_ebus(ebus) {
                 for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, "se")) {
+                        if (!strcmp(edev->prom_node->name, "se")) {
                                 callback(edev, arg);
                                 continue;
-                        } else if (!strcmp(edev->prom_name, "serial")) {
-                                char compat[32];
+                        } else if (!strcmp(edev->prom_node->name, "serial")) {
+                                char *compat;
                                 int clen;
 
                                 /* On RIO this can be an SE, check it.  We could
                                  * just check ebus->is_rio, but this is more portable.
                                  */
-                                clen = prom_getproperty(edev->prom_node, "compatible",
-                                                        compat, sizeof(compat));
-                                if (clen > 0) {
+                                compat = of_get_property(edev->prom_node,
+                                                         "compatible", &clen);
+                                if (compat && clen > 0) {
                                         if (strncmp(compat, "sab82532", 8) == 0) {
                                                 callback(edev, arg);
                                                 continue;
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 4cdb610cdd37..0268b307c01e 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1053,7 +1053,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
          */
         for_each_ebus(ebus) {
                 for_each_ebusdev(dev, ebus) {
-                        if (dev->prom_node == up->port_node) {
+                        if (dev->prom_node->node == up->port_node) {
                                 /*
                                  * The EBus is broken on sparc; it delivers
                                  * virtual addresses in resources. Oh well...
@@ -1073,7 +1073,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
 #ifdef CONFIG_SPARC64
         for_each_isa(isa_br) {
                 for_each_isadev(isa_dev, isa_br) {
-                        if (isa_dev->prom_node == up->port_node) {
+                        if (isa_dev->prom_node->node == up->port_node) {
                                 /* Same on sparc64. Cool architecure... */
                                 up->port.membase = (char *) isa_dev->resource.start;
                                 up->port.mapbase = isa_dev->resource.start;