From: Andre Przywara <andre.przywara@arm.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Emilio Lopez <emilio@elopez.com.ar>,
Michael Turquette <mturquette@baylibre.com>,
Chen-Yu Tsai <wens@csie.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>,
linux-clk@vger.kernel.org, linux-sunxi@googlegroups.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/3] clk: sunxi: improve mux_clk error handling and reporting
Date: Tue, 16 Feb 2016 10:46:06 +0000 [thread overview]
Message-ID: <1455619568-1906-2-git-send-email-andre.przywara@arm.com> (raw)
In-Reply-To: <1455619568-1906-1-git-send-email-andre.przywara@arm.com>
We now catch and report a failing ioremap, also a failure in the final
step of the clock registration is now handled and reported.
Also warnings are turned into errors.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
drivers/clk/sunxi/clk-sunxi.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 99f60ef..775e137 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -674,11 +674,16 @@ static struct clk * __init sunxi_mux_clk_setup(struct device_node *node,
int i;
reg = of_iomap(node, 0);
+ if (!reg) {
+ pr_err("Could not map registers for mux-clk: %s\n",
+ of_node_full_name(node));
+ return NULL;
+ }
i = of_clk_parent_fill(node, parents, SUNXI_MAX_PARENTS);
if (of_property_read_string(node, "clock-output-names", &clk_name)) {
- pr_warn("%s: could not read clock-output-names for \"%s\"\n",
- __func__, clk_name);
+ pr_err("%s: could not read clock-output-names from \"%s\"\n",
+ __func__, of_node_full_name(node));
goto out_unmap;
}
@@ -688,15 +693,19 @@ static struct clk * __init sunxi_mux_clk_setup(struct device_node *node,
0, &clk_lock);
if (IS_ERR(clk)) {
- pr_warn("%s: failed to register mux clock %s: %ld\n", __func__,
- clk_name, PTR_ERR(clk));
+ pr_err("%s: failed to register mux clock %s: %ld\n", __func__,
+ clk_name, PTR_ERR(clk));
goto out_unmap;
}
- of_clk_add_provider(node, of_clk_src_simple_get, clk);
+ if (of_clk_add_provider(node, of_clk_src_simple_get, clk)) {
+ pr_err("%s: failed to add clock provider for %s\n",
+ __func__, clk_name);
+ clk_unregister_divider(clk);
+ goto out_unmap;
+ }
return clk;
-
out_unmap:
iounmap(reg);
return NULL;
--
2.6.4
next prev parent reply other threads:[~2016-02-16 10:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 10:46 [PATCH v2 0/3] clk: sunxi: error checking on clock setup Andre Przywara
2016-02-16 10:46 ` Andre Przywara [this message]
2016-02-16 10:46 ` [PATCH v2 2/3] clk: sunxi: improve divider_clk error handling and reporting Andre Przywara
2016-02-16 10:46 ` [PATCH v2 3/3] clk: sunxi: Improve divs_clk " Andre Przywara
2016-02-22 3:45 ` [PATCH v2 0/3] clk: sunxi: error checking on clock setup Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455619568-1906-2-git-send-email-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=emilio@elopez.com.ar \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox