hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Herring 2018-08-28 10:44:28 -05:00 committed by Mark Brown
parent 6e2d6b2728
commit 5d585e1e75
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/fsl/fsl_esai.c
View File

@ -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);

4
sound/soc/fsl/fsl_utils.c
View File

@ -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) {

2
sound/soc/meson/axg-card.c
View File

@ -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;
}

2
sound/soc/stm/stm32_sai.c
View File

@ -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;
}

7
sound/soc/stm/stm32_sai_sub.c
View File

@ -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;
}