Re: [PATCH] mmc: Convert to using %pOF instead of full_name

[Ulf Hansson]

On 18 July 2017 at 23:43, Rob Herring <robh@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxx>
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx>
> Cc: Jan Glauber <jglauber@xxxxxxxxxx>
> Cc: David Daney <david.daney@xxxxxxxxxx>
> Cc: "Steven J. Hill" <Steven.Hill@xxxxxxxxxx>
> Cc: linux-mmc@xxxxxxxxxxxxxxx

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/core/core.c      | 8 ++++----
>  drivers/mmc/host/atmel-mci.c | 4 ++--
>  drivers/mmc/host/cavium.c    | 6 ++----
>  3 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 26431267a3e2..6b4117615ad6 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1137,11 +1137,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;
>         }
>
> @@ -1153,8 +1153,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 97de2d32ba84..b7c1cd384306 100644
> --- 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 3686d77c717b..27fb625cbcf3 100644
> --- 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;
>         }
>
> --
> 2.11.0
>