summaryrefslogtreecommitdiffstats
path: root/drivers/clk/sunxi
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2016-02-16 10:46:06 +0000
committerMaxime Ripard <maxime.ripard@free-electrons.com>2016-02-21 19:44:09 -0800
commit72360b91164aa35753942e5310ae1e1d16e28611 (patch)
tree6f6ccfaf324a71b1e91f71ef65f6cd545ac358d0 /drivers/clk/sunxi
parent33f60d02605a3a604e56b07a78d80d7d801b2843 (diff)
downloadlinux-72360b91164aa35753942e5310ae1e1d16e28611.tar.gz
linux-72360b91164aa35753942e5310ae1e1d16e28611.tar.bz2
linux-72360b91164aa35753942e5310ae1e1d16e28611.zip
clk: sunxi: improve mux_clk error handling and reporting
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> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'drivers/clk/sunxi')
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 99f60efe7b1c..775e13776f84 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;