Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2d79333 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Stephen Boyd
Browse files

clk: clk-conf: Do not print error messages if EPROBE_DEFER 



EPROBE_DEFER is not an error, hence printing an error message like

	clk: couldn't get clock 0 for /soc/display@feb00000

may confuse the user.

Suppress error messages in case of probe deferral to fix this.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 67bcc2c5

drivers/clk/clk-conf.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
			return 0;

			return 0;

		pclk = of_clk_get_from_provider(&clkspec);

		pclk = of_clk_get_from_provider(&clkspec);

		if (IS_ERR(pclk)) {

		if (IS_ERR(pclk)) {

			if (PTR_ERR(pclk) != -EPROBE_DEFER)

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

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

					index, node->full_name);

					index, node->full_name);

			return PTR_ERR(pclk);

			return PTR_ERR(pclk);
@@ -55,6 +56,7 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
		}

		}

		clk = of_clk_get_from_provider(&clkspec);

		clk = of_clk_get_from_provider(&clkspec);

		if (IS_ERR(clk)) {

		if (IS_ERR(clk)) {

			if (PTR_ERR(clk) != -EPROBE_DEFER)

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

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

					index, node->full_name);

					index, node->full_name);

			rc = PTR_ERR(clk);

			rc = PTR_ERR(clk);
@@ -99,6 +101,7 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier) 




			clk = of_clk_get_from_provider(&clkspec);

			clk = of_clk_get_from_provider(&clkspec);

			if (IS_ERR(clk)) {

			if (IS_ERR(clk)) {

				if (PTR_ERR(clk) != -EPROBE_DEFER)

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

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

						index, node->full_name);

						index, node->full_name);

				return PTR_ERR(clk);

				return PTR_ERR(clk);