summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2017-01-04 05:12:33 -0500
committerStephen Boyd <sboyd@codeaurora.org>2017-01-09 19:09:05 -0500
commite2d793330875d60e2c81de7a75b6bba159fef70a (patch)
tree9852ca74da7019a922a3ac246387c9fbbd1c61f8
parent67bcc2c5f1da8c5bb58e72354274ea5c59a3950a (diff)
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: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/clk-conf.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
index 674785d968a3..e0e02a6e5900 100644
--- a/drivers/clk/clk-conf.c
+++ b/drivers/clk/clk-conf.c
@@ -40,8 +40,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
40 return 0; 40 return 0;
41 pclk = of_clk_get_from_provider(&clkspec); 41 pclk = of_clk_get_from_provider(&clkspec);
42 if (IS_ERR(pclk)) { 42 if (IS_ERR(pclk)) {
43 pr_warn("clk: couldn't get parent clock %d for %s\n", 43 if (PTR_ERR(pclk) != -EPROBE_DEFER)
44 index, node->full_name); 44 pr_warn("clk: couldn't get parent clock %d for %s\n",
45 index, node->full_name);
45 return PTR_ERR(pclk); 46 return PTR_ERR(pclk);
46 } 47 }
47 48
@@ -55,8 +56,9 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
55 } 56 }
56 clk = of_clk_get_from_provider(&clkspec); 57 clk = of_clk_get_from_provider(&clkspec);
57 if (IS_ERR(clk)) { 58 if (IS_ERR(clk)) {
58 pr_warn("clk: couldn't get assigned clock %d for %s\n", 59 if (PTR_ERR(clk) != -EPROBE_DEFER)
59 index, node->full_name); 60 pr_warn("clk: couldn't get assigned clock %d for %s\n",
61 index, node->full_name);
60 rc = PTR_ERR(clk); 62 rc = PTR_ERR(clk);
61 goto err; 63 goto err;
62 } 64 }
@@ -99,8 +101,9 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)
99 101
100 clk = of_clk_get_from_provider(&clkspec); 102 clk = of_clk_get_from_provider(&clkspec);
101 if (IS_ERR(clk)) { 103 if (IS_ERR(clk)) {
102 pr_warn("clk: couldn't get clock %d for %s\n", 104 if (PTR_ERR(clk) != -EPROBE_DEFER)
103 index, node->full_name); 105 pr_warn("clk: couldn't get clock %d for %s\n",
106 index, node->full_name);
104 return PTR_ERR(clk); 107 return PTR_ERR(clk);
105 } 108 }
106 109