mmc: 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>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Jan Glauber <jglauber@cavium.com>
Cc: David Daney <david.daney@cavium.com>
Cc: "Steven J. Hill" <Steven.Hill@cavium.com>
Cc: linux-mmc@vger.kernel.org
Acked-by: David Daney <david.daney@cavium.com>
Tested-by: Steven J. Hill <Steven.Hill@cavium.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 731aa9f..15623cc 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1134,11 +1134,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
        voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
        num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
        if (!voltage_ranges) {
-               pr_debug("%s: voltage-ranges unspecified\n", np->full_name);
+               pr_debug("%pOF: voltage-ranges unspecified\n", np);
                return 0;
        }
        if (!num_ranges) {
-               pr_err("%s: voltage-ranges empty\n", np->full_name);
+               pr_err("%pOF: voltage-ranges empty\n", np);
                return -EINVAL;
        }
 
@@ -1150,8 +1150,8 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
                                be32_to_cpu(voltage_ranges[j]),
                                be32_to_cpu(voltage_ranges[j + 1]));
                if (!ocr_mask) {
-                       pr_err("%s: voltage-range #%d is invalid\n",
-                               np->full_name, i);
+                       pr_err("%pOF: voltage-range #%d is invalid\n",
+                               np, i);
                        return -EINVAL;
                }
                *mask |= ocr_mask;

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index dcd0287..0a0ebf3 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -665,8 +665,8 @@ atmci_of_init(struct platform_device *pdev)
 
        for_each_child_of_node(np, cnp) {
                if (of_property_read_u32(cnp, "reg", &slot_id)) {
-                       dev_warn(&pdev->dev, "reg property is missing for %s\n",
-                                cnp->full_name);
+                       dev_warn(&pdev->dev, "reg property is missing for %pOF\n",
+                                cnp);
                        continue;
                }
 

diff --git a/drivers/mmc/host/cavium.c b/drivers/mmc/host/cavium.c
index 3686d77..27fb625 100644 (file)
--- a/drivers/mmc/host/cavium.c
+++ b/drivers/mmc/host/cavium.c
@@ -957,14 +957,12 @@ static int cvm_mmc_of_parse(struct device *dev, struct cvm_mmc_slot *slot)
 
        ret = of_property_read_u32(node, "reg", &id);
        if (ret) {
-               dev_err(dev, "Missing or invalid reg property on %s\n",
-                       of_node_full_name(node));
+               dev_err(dev, "Missing or invalid reg property on %pOF\n", node);
                return ret;
        }
 
        if (id >= CAVIUM_MAX_MMC || slot->host->slot[id]) {
-               dev_err(dev, "Invalid reg property on %s\n",
-                       of_node_full_name(node));
+               dev_err(dev, "Invalid reg property on %pOF\n", node);
                return -EINVAL;
        }