aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-08-07 19:29:18 -0400
committerMark Brown <broonie@kernel.org>2017-08-08 06:36:54 -0400
commit06d15a2ede999a77f0d05aa600ed473d90d9a909 (patch)
tree728f4c36a02f893062905f376888857cde28f9af
parent29a22ebfa4c44bf96b3d00d90b5e3b8128d8a162 (diff)
ASoC: fsl: 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: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/fsl/fsl_dma.c4
-rw-r--r--sound/soc/fsl/imx-audmux.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index ccadefceeff2..ed8ea002902d 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -897,8 +897,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
897 897
898 ret = of_address_to_resource(ssi_np, 0, &res); 898 ret = of_address_to_resource(ssi_np, 0, &res);
899 if (ret) { 899 if (ret) {
900 dev_err(&pdev->dev, "could not determine resources for %s\n", 900 dev_err(&pdev->dev, "could not determine resources for %pOF\n",
901 ssi_np->full_name); 901 ssi_np);
902 of_node_put(ssi_np); 902 of_node_put(ssi_np);
903 return ret; 903 return ret;
904 } 904 }
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index fc57da341d61..392d5eef356d 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -268,13 +268,13 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
268 268
269 ret = of_property_read_u32(child, "fsl,audmux-port", &port); 269 ret = of_property_read_u32(child, "fsl,audmux-port", &port);
270 if (ret) { 270 if (ret) {
271 dev_warn(&pdev->dev, "Failed to get fsl,audmux-port of child node \"%s\"\n", 271 dev_warn(&pdev->dev, "Failed to get fsl,audmux-port of child node \"%pOF\"\n",
272 child->full_name); 272 child);
273 continue; 273 continue;
274 } 274 }
275 if (!of_property_read_bool(child, "fsl,port-config")) { 275 if (!of_property_read_bool(child, "fsl,port-config")) {
276 dev_warn(&pdev->dev, "child node \"%s\" does not have property fsl,port-config\n", 276 dev_warn(&pdev->dev, "child node \"%pOF\" does not have property fsl,port-config\n",
277 child->full_name); 277 child);
278 continue; 278 continue;
279 } 279 }
280 280
@@ -292,15 +292,15 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
292 } 292 }
293 293
294 if (ret != -EOVERFLOW) { 294 if (ret != -EOVERFLOW) {
295 dev_err(&pdev->dev, "Failed to read u32 at index %d of child %s\n", 295 dev_err(&pdev->dev, "Failed to read u32 at index %d of child %pOF\n",
296 i, child->full_name); 296 i, child);
297 continue; 297 continue;
298 } 298 }
299 299
300 if (audmux_type == IMX31_AUDMUX) { 300 if (audmux_type == IMX31_AUDMUX) {
301 if (i % 2) { 301 if (i % 2) {
302 dev_err(&pdev->dev, "One pdcr value is missing in child node %s\n", 302 dev_err(&pdev->dev, "One pdcr value is missing in child node %pOF\n",
303 child->full_name); 303 child);
304 continue; 304 continue;
305 } 305 }
306 imx_audmux_v2_configure_port(port, ptcr, pdcr); 306 imx_audmux_v2_configure_port(port, ptcr, pdcr);