memory: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index 99e644cda4d13db301b713a5752788c0f646dfa1..597282e35c6914b9ded22231c849ef8072296a97 100644 (file)
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -156,8 +156,8 @@ static int atmel_ebi_xslate_smc_timings(struct atmel_ebi_dev *ebid,
 out:
        if (ret) {
                dev_err(ebid->ebi->dev,
-                       "missing or invalid timings definition in %s",
-                       np->full_name);
+                       "missing or invalid timings definition in %pOF",
+                       np);
                return ret;
        }
 
@@ -267,8 +267,8 @@ static int atmel_ebi_xslate_smc_config(struct atmel_ebi_dev *ebid,
                return -EINVAL;
 
        if ((ret > 0 && !required) || (!ret && required)) {
-               dev_err(ebid->ebi->dev, "missing atmel,smc- properties in %s",
-                       np->full_name);
+               dev_err(ebid->ebi->dev, "missing atmel,smc- properties in %pOF",
+                       np);
                return -EINVAL;
        }
 
@@ -311,8 +311,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
 
                if (cs >= AT91_MATRIX_EBI_NUM_CS ||
                    !(ebi->caps->available_cs & BIT(cs))) {
-                       dev_err(dev, "invalid reg property in %s\n",
-                               np->full_name);
+                       dev_err(dev, "invalid reg property in %pOF\n", np);
                        return -EINVAL;
                }
 
@@ -321,7 +320,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
        }
 
        if (!numcs) {
-               dev_err(dev, "invalid reg property in %s\n", np->full_name);
+               dev_err(dev, "invalid reg property in %pOF\n", np);
                return -EINVAL;
        }
 
@@ -569,8 +568,8 @@ static int atmel_ebi_probe(struct platform_device *pdev)
 
                ret = atmel_ebi_dev_setup(ebi, child, reg_cells);
                if (ret) {
-                       dev_err(dev, "failed to configure EBI bus for %s, disabling the device",
-                               child->full_name);
+                       dev_err(dev, "failed to configure EBI bus for %pOF, disabling the device",
+                               child);
 
                        ret = atmel_ebi_dev_disable(ebi, child);
                        if (ret)

diff --git a/drivers/memory/jz4780-nemc.c b/drivers/memory/jz4780-nemc.c
index 919d1925acb961d3a038d5a2d9125500ef2dbf7d..bcf06adefc96c1c99c5dce6e79f1582c937a4a56 100644 (file)
--- a/drivers/memory/jz4780-nemc.c
+++ b/drivers/memory/jz4780-nemc.c
@@ -322,8 +322,8 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
                        bank = of_read_number(prop, 1);
                        if (bank < 1 || bank >= JZ4780_NEMC_NUM_BANKS) {
                                dev_err(nemc->dev,
-                                       "%s requests invalid bank %u\n",
-                                       child->full_name, bank);
+                                       "%pOF requests invalid bank %u\n",
+                                       child, bank);
 
                                /* Will continue the outer loop below. */
                                referenced = 0;
@@ -334,12 +334,12 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
                }
 
                if (!referenced) {
-                       dev_err(nemc->dev, "%s has no addresses\n",
-                               child->full_name);
+                       dev_err(nemc->dev, "%pOF has no addresses\n",
+                               child);
                        continue;
                } else if (nemc->banks_present & referenced) {
-                       dev_err(nemc->dev, "%s conflicts with another node\n",
-                               child->full_name);
+                       dev_err(nemc->dev, "%pOF conflicts with another node\n",
+                               child);
                        continue;
                }
 

diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c
index 24852812fd44fce5f70f1bcb35d409be77a66e7d..981860879d02e88f0266dfc5367280520b53cda4 100644 (file)
--- a/drivers/memory/mvebu-devbus.c
+++ b/drivers/memory/mvebu-devbus.c
@@ -105,8 +105,8 @@ static int get_timing_param_ps(struct devbus *devbus,
 
        err = of_property_read_u32(node, name, &time_ps);
        if (err < 0) {
-               dev_err(devbus->dev, "%s has no '%s' property\n",
-                       name, node->full_name);
+               dev_err(devbus->dev, "%pOF has no '%s' property\n",
+                       node, name);
                return err;
        }
 
@@ -127,8 +127,8 @@ static int devbus_get_timing_params(struct devbus *devbus,
        err = of_property_read_u32(node, "devbus,bus-width", &r->bus_width);
        if (err < 0) {
                dev_err(devbus->dev,
-                       "%s has no 'devbus,bus-width' property\n",
-                       node->full_name);
+                       "%pOF has no 'devbus,bus-width' property\n",
+                       node);
                return err;
        }
 
@@ -180,8 +180,8 @@ static int devbus_get_timing_params(struct devbus *devbus,
                                           &w->sync_enable);
                if (err < 0) {
                        dev_err(devbus->dev,
-                               "%s has no 'devbus,sync-enable' property\n",
-                               node->full_name);
+                               "%pOF has no 'devbus,sync-enable' property\n",
+                               node);
                        return err;
                }
        }

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index a80e17de906db42c16b7d2c2919009b6dee2ebb5..7059bbda2faca0d2b7e672781bdd1056b8beef75 100644 (file)
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1930,8 +1930,8 @@ static int gpmc_probe_onenand_child(struct platform_device *pdev,
        struct omap_onenand_platform_data *gpmc_onenand_data;
 
        if (of_property_read_u32(child, "reg", &val) < 0) {
-               dev_err(&pdev->dev, "%s has no 'reg' property\n",
-                       child->full_name);
+               dev_err(&pdev->dev, "%pOF has no 'reg' property\n",
+                       child);
                return -ENODEV;
        }
 
@@ -1979,14 +1979,14 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
        struct gpmc_device *gpmc = platform_get_drvdata(pdev);
 
        if (of_property_read_u32(child, "reg", &cs) < 0) {
-               dev_err(&pdev->dev, "%s has no 'reg' property\n",
-                       child->full_name);
+               dev_err(&pdev->dev, "%pOF has no 'reg' property\n",
+                       child);
                return -ENODEV;
        }
 
        if (of_address_to_resource(child, 0, &res) < 0) {
-               dev_err(&pdev->dev, "%s has malformed 'reg' property\n",
-                       child->full_name);
+               dev_err(&pdev->dev, "%pOF has malformed 'reg' property\n",
+                       child);
                return -ENODEV;
        }
 
@@ -2084,8 +2084,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                ret = of_property_read_u32(child, "bank-width",
                                           &gpmc_s.device_width);
                if (ret < 0) {
-                       dev_err(&pdev->dev, "%s has no 'bank-width' property\n",
-                               child->full_name);
+                       dev_err(&pdev->dev, "%pOF has no 'bank-width' property\n",
+                               child);
                        goto err;
                }
        }