ASoC: 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: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index c1d1d06783e53e4d545b3a1e5d7cd4dae275e0cc..57b484768a58f0e3d97a521c32d3215dd3ed5d41 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -807,7 +807,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        esai_priv->pdev = pdev;
-       strncpy(esai_priv->name, np->name, sizeof(esai_priv->name) - 1);
+       snprintf(esai_priv->name, sizeof(esai_priv->name), "%pOFn", np);
 
        /* Get the addresses and IRQ */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index 7f0fa4b5222318b95c7bf2c41f7bacd6dc47b9fe..9981668ab59099f2d98dd91fd8fff2530292c354 100644 (file)
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -57,8 +57,8 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
                of_node_put(dma_channel_np);
                return ret;
        }
-       snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s",
-                (unsigned long long) res.start, dma_channel_np->name);
+       snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%pOFn",
+                (unsigned long long) res.start, dma_channel_np);
 
        iprop = of_get_property(dma_channel_np, "cell-index", NULL);
        if (!iprop) {

diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 2914ba0d965bd87b989f309757153f50a9254086..b76a5f4f17858217b20a89cef55e926ab4bad820 100644 (file)
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -478,7 +478,7 @@ static int axg_card_set_be_link(struct snd_soc_card *card,
 
        ret = axg_card_set_link_name(card, link, "be");
        if (ret)
-               dev_err(card->dev, "error setting %s link name\n", np->name);
+               dev_err(card->dev, "error setting %pOFn link name\n", np);
 
        return ret;
 }

diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c
index f22654253c43865116c8caff684f3b9013f20e01..d597eba61992ce6decf9651843a82c72763c109b 100644 (file)
--- a/sound/soc/stm/stm32_sai.c
+++ b/sound/soc/stm/stm32_sai.c
@@ -104,7 +104,7 @@ static int stm32_sai_set_sync(struct stm32_sai_data *sai_client,
 
        if (!pdev) {
                dev_err(&sai_client->pdev->dev,
-                       "Device not found for node %s\n", np_provider->name);
+                       "Device not found for node %pOFn\n", np_provider);
                return -ENODEV;
        }
 

diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 06fba9650ac4fc8e539ef286a963c1b2c07e2569..56a227e0bd711eb065660f75811ffc682e916359 100644 (file)
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -1124,16 +1124,15 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,
        sai->sync = SAI_SYNC_NONE;
        if (args.np) {
                if (args.np == np) {
-                       dev_err(&pdev->dev, "%s sync own reference\n",
-                               np->name);
+                       dev_err(&pdev->dev, "%pOFn sync own reference\n", np);
                        of_node_put(args.np);
                        return -EINVAL;
                }
 
                sai->np_sync_provider  = of_get_parent(args.np);
                if (!sai->np_sync_provider) {
-                       dev_err(&pdev->dev, "%s parent node not found\n",
-                               np->name);
+                       dev_err(&pdev->dev, "%pOFn parent node not found\n",
+                               np);
                        of_node_put(args.np);
                        return -ENODEV;
                }