Commit 16673931 authored by Rob Herring's avatar Rob Herring Committed by Stephen Boyd
Browse files

clk: 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: default avatarRob Herring <robh@kernel.org>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: "Emilio López" <emilio@elopez.com.ar>
Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
Cc: Prashant Gaikwad <pgaikwad@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarJames Liao <jamesjj.liao@mediatek.com>
Acked-by: default avatarAlexandre TORGUE <alexandre.torgue@st.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 45899dc5

drivers/clk/berlin/bg2.c

+1 −2
Original line number Diff line number Diff line
@@ -679,8 +679,7 @@ static void __init berlin2_clock_setup(struct device_node *np) 
		if (!IS_ERR(hws[n]))

			continue;



		pr_err("%s: Unable to register leaf clock %d\n",

		       np->full_name, n);

		pr_err("%pOF: Unable to register leaf clock %d\n", np, n);

		goto bg2_fail;

	}

drivers/clk/berlin/bg2q.c

+3 −4
Original line number Diff line number Diff line
@@ -304,14 +304,14 @@ static void __init berlin2q_clock_setup(struct device_node *np) 


	gbase = of_iomap(parent_np, 0);

	if (!gbase) {

		pr_err("%s: Unable to map global base\n", np->full_name);

		pr_err("%pOF: Unable to map global base\n", np);

		return;

	}



	/* BG2Q CPU PLL is not part of global registers */

	cpupll_base = of_iomap(parent_np, 1);

	if (!cpupll_base) {

		pr_err("%s: Unable to map cpupll base\n", np->full_name);

		pr_err("%pOF: Unable to map cpupll base\n", np);

		iounmap(gbase);

		return;

	}
@@ -376,8 +376,7 @@ static void __init berlin2q_clock_setup(struct device_node *np) 
		if (!IS_ERR(hws[n]))

			continue;



		pr_err("%s: Unable to register leaf clock %d\n",

		       np->full_name, n);

		pr_err("%pOF: Unable to register leaf clock %d\n", np, n);

		goto bg2q_fail;

	}

drivers/clk/clk-asm9260.c

+2 −2
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ static void __init asm9260_acc_init(struct device_node *np) 
		if (!IS_ERR(hws[n]))

			continue;



		pr_err("%s: Unable to register leaf clock %d\n",

				np->full_name, n);

		pr_err("%pOF: Unable to register leaf clock %d\n",

				np, n);

		goto fail;

	}

drivers/clk/clk-conf.c

+8 −8
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
	num_parents = of_count_phandle_with_args(node, "assigned-clock-parents",

						 "#clock-cells");

	if (num_parents == -EINVAL)

		pr_err("clk: invalid value of clock-parents property at %s\n",

		       node->full_name);

		pr_err("clk: invalid value of clock-parents property at %pOF\n",

		       node);



	for (index = 0; index < num_parents; index++) {

		rc = of_parse_phandle_with_args(node, "assigned-clock-parents",
@@ -41,8 +41,8 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
		pclk = of_clk_get_from_provider(&clkspec);

		if (IS_ERR(pclk)) {

			if (PTR_ERR(pclk) != -EPROBE_DEFER)

				pr_warn("clk: couldn't get parent clock %d for %s\n",

					index, node->full_name);

				pr_warn("clk: couldn't get parent clock %d for %pOF\n",

					index, node);

			return PTR_ERR(pclk);

		}
@@ -57,8 +57,8 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
		clk = of_clk_get_from_provider(&clkspec);

		if (IS_ERR(clk)) {

			if (PTR_ERR(clk) != -EPROBE_DEFER)

				pr_warn("clk: couldn't get assigned clock %d for %s\n",

					index, node->full_name);

				pr_warn("clk: couldn't get assigned clock %d for %pOF\n",

					index, node);

			rc = PTR_ERR(clk);

			goto err;

		}
@@ -102,8 +102,8 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier) 
			clk = of_clk_get_from_provider(&clkspec);

			if (IS_ERR(clk)) {

				if (PTR_ERR(clk) != -EPROBE_DEFER)

					pr_warn("clk: couldn't get clock %d for %s\n",

						index, node->full_name);

					pr_warn("clk: couldn't get clock %d for %pOF\n",

						index, node);

				return PTR_ERR(clk);

			}

drivers/clk/clk-moxart.c

+6 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void __init moxart_of_pll_clk_init(struct device_node *node) 


	base = of_iomap(node, 0);

	if (!base) {

		pr_err("%s: of_iomap failed\n", node->full_name);

		pr_err("%pOF: of_iomap failed\n", node);

		return;

	}
@@ -39,13 +39,13 @@ static void __init moxart_of_pll_clk_init(struct device_node *node) 


	ref_clk = of_clk_get(node, 0);

	if (IS_ERR(ref_clk)) {

		pr_err("%s: of_clk_get failed\n", node->full_name);

		pr_err("%pOF: of_clk_get failed\n", node);

		return;

	}



	hw = clk_hw_register_fixed_factor(NULL, name, parent_name, 0, mul, 1);

	if (IS_ERR(hw)) {

		pr_err("%s: failed to register clock\n", node->full_name);

		pr_err("%pOF: failed to register clock\n", node);

		return;

	}
@@ -70,7 +70,7 @@ static void __init moxart_of_apb_clk_init(struct device_node *node) 


	base = of_iomap(node, 0);

	if (!base) {

		pr_err("%s: of_iomap failed\n", node->full_name);

		pr_err("%pOF: of_iomap failed\n", node);

		return;

	}
@@ -83,13 +83,13 @@ static void __init moxart_of_apb_clk_init(struct device_node *node) 


	pll_clk = of_clk_get(node, 0);

	if (IS_ERR(pll_clk)) {

		pr_err("%s: of_clk_get failed\n", node->full_name);

		pr_err("%pOF: of_clk_get failed\n", node);

		return;

	}



	hw = clk_hw_register_fixed_factor(NULL, name, parent_name, 0, 1, div);

	if (IS_ERR(hw)) {

		pr_err("%s: failed to register clock\n", node->full_name);

		pr_err("%pOF: failed to register clock\n", node);

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE