macintosh: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 07074820a16746ec74351ea2273cfecee27e6353..17d3bc917562ed5024b60e9f1d95ca1137162791 100644 (file)
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -360,9 +360,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
                                               struct macio_dev *in_bay,
                                               struct resource *parent_res)
 {
+       char name[MAX_NODE_NAME_SIZE + 1];
        struct macio_dev *dev;
        const u32 *reg;
-       
+
        if (np == NULL)
                return NULL;
 
@@ -402,6 +403,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
 
        /* MacIO itself has a different reg, we use it's PCI base */
+       snprintf(name, sizeof(name), "%pOFn", np);
        if (np == chip->of_node) {
                dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",
                             chip->lbus.index,
@@ -410,12 +412,12 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #else
                        0, /* NuBus may want to do something better here */
 #endif
-                       MAX_NODE_NAME_SIZE, np->name);
+                       MAX_NODE_NAME_SIZE, name);
        } else {
                reg = of_get_property(np, "reg", NULL);
                dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",
                             chip->lbus.index,
-                            reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
+                            reg ? *reg : 0, MAX_NODE_NAME_SIZE, name);
        }
 
        /* Setup interrupts & resources */

diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index ca4fcffe454ba8ec9806408efeaca30e938266f5..d2451e58acb97986441889a205612591afcb8433 100644 (file)
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -58,7 +58,13 @@ static ssize_t devspec_show(struct device *dev,
 static DEVICE_ATTR_RO(modalias);
 static DEVICE_ATTR_RO(devspec);
 
-macio_config_of_attr (name, "%s\n");
+static ssize_t name_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%pOFn\n", dev->of_node);
+}
+static DEVICE_ATTR_RO(name);
+
 macio_config_of_attr (type, "%s\n");
 
 static struct attribute *macio_dev_attrs[] = {

diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index d174c74373371b8ca533150767cdf12fc224660c..86d65462a61c091a201dd697919f83e98e3dbbc5 100644 (file)
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -277,7 +277,7 @@ static int __init smu_controls_init(void)
                fct = smu_fan_create(fan, 0);
                if (fct == NULL) {
                        printk(KERN_WARNING "windfarm: Failed to create SMU "
-                              "RPM fan %s\n", fan->name);
+                              "RPM fan %pOFn\n", fan);
                        continue;
                }
                list_add(&fct->link, &smu_fans);
@@ -296,7 +296,7 @@ static int __init smu_controls_init(void)
                fct = smu_fan_create(fan, 1);
                if (fct == NULL) {
                        printk(KERN_WARNING "windfarm: Failed to create SMU "
-                              "PWM fan %s\n", fan->name);
+                              "PWM fan %pOFn\n", fan);
                        continue;
                }
                list_add(&fct->link, &smu_fans);