diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:42:45 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-08-29 09:21:50 -0400 |
commit | 7f27b5b8ed1f77427811d13788fbdb2f53ce94a4 (patch) | |
tree | 0e5abffa3801b97d6aa9dd7df6d274a6a2a89b93 /arch/mips/ath79 | |
parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) |
MIPS: 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: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/16783/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ath79')
-rw-r--r-- | arch/mips/ath79/clock.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c index fa845953f736..6b1000b6a6a6 100644 --- a/arch/mips/ath79/clock.c +++ b/arch/mips/ath79/clock.c | |||
@@ -487,17 +487,16 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np) | |||
487 | { | 487 | { |
488 | struct clk *ref_clk; | 488 | struct clk *ref_clk; |
489 | void __iomem *pll_base; | 489 | void __iomem *pll_base; |
490 | const char *dnfn = of_node_full_name(np); | ||
491 | 490 | ||
492 | ref_clk = of_clk_get(np, 0); | 491 | ref_clk = of_clk_get(np, 0); |
493 | if (IS_ERR(ref_clk)) { | 492 | if (IS_ERR(ref_clk)) { |
494 | pr_err("%s: of_clk_get failed\n", dnfn); | 493 | pr_err("%pOF: of_clk_get failed\n", np); |
495 | goto err; | 494 | goto err; |
496 | } | 495 | } |
497 | 496 | ||
498 | pll_base = of_iomap(np, 0); | 497 | pll_base = of_iomap(np, 0); |
499 | if (!pll_base) { | 498 | if (!pll_base) { |
500 | pr_err("%s: can't map pll registers\n", dnfn); | 499 | pr_err("%pOF: can't map pll registers\n", np); |
501 | goto err_clk; | 500 | goto err_clk; |
502 | } | 501 | } |
503 | 502 | ||
@@ -506,12 +505,12 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np) | |||
506 | else if (of_device_is_compatible(np, "qca,ar9330-pll")) | 505 | else if (of_device_is_compatible(np, "qca,ar9330-pll")) |
507 | ar9330_clk_init(ref_clk, pll_base); | 506 | ar9330_clk_init(ref_clk, pll_base); |
508 | else { | 507 | else { |
509 | pr_err("%s: could not find any appropriate clk_init()\n", dnfn); | 508 | pr_err("%pOF: could not find any appropriate clk_init()\n", np); |
510 | goto err_iounmap; | 509 | goto err_iounmap; |
511 | } | 510 | } |
512 | 511 | ||
513 | if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) { | 512 | if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) { |
514 | pr_err("%s: could not register clk provider\n", dnfn); | 513 | pr_err("%pOF: could not register clk provider\n", np); |
515 | goto err_iounmap; | 514 | goto err_iounmap; |
516 | } | 515 | } |
517 | 516 | ||