aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/imx
diff options
context:
space:
mode:
authorBai Ping <b51503@freescale.com>2015-11-25 21:18:43 -0500
committerShawn Guo <shawnguo@kernel.org>2015-12-02 01:10:25 -0500
commit31cbb57d5ac3b8f7a84803eb329fcc8a73fb4ab6 (patch)
treea2d9fd7e94c5b89d64dc90712d8baba50c8eaead /drivers/clk/imx
parentfdb868cd059a97b35e4a5fcfa073a5d9c375fcdf (diff)
clk: imx: Replace clk error check with imx_check_clocks()
As we already have a 'imx_check_clocks' to do the clock error check, so cleanup the error check code. Signed-off-by: Bai Ping <b51503@freescale.com> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'drivers/clk/imx')
-rw-r--r--drivers/clk/imx/clk-imx6ul.c4
-rw-r--r--drivers/clk/imx/clk-imx7d.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index 01718d05e952..08692d74b884 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -399,9 +399,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)
399 /* mask handshake of mmdc */ 399 /* mask handshake of mmdc */
400 writel_relaxed(BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR); 400 writel_relaxed(BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR);
401 401
402 for (i = 0; i < ARRAY_SIZE(clks); i++) 402 imx_check_clocks(clks, ARRAY_SIZE(clks));
403 if (IS_ERR(clks[i]))
404 pr_err("i.MX6UL clk %d: register failed with %ld\n", i, PTR_ERR(clks[i]));
405 403
406 clk_data.clks = clks; 404 clk_data.clks = clks;
407 clk_data.clk_num = ARRAY_SIZE(clks); 405 clk_data.clk_num = ARRAY_SIZE(clks);
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index 581b428d3133..fbb6a8c8653d 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -839,10 +839,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
839 clks[IMX7D_PLL_ARM_MAIN_CLK], 839 clks[IMX7D_PLL_ARM_MAIN_CLK],
840 clks[IMX7D_PLL_SYS_MAIN_CLK]); 840 clks[IMX7D_PLL_SYS_MAIN_CLK]);
841 841
842 for (i = 0; i < ARRAY_SIZE(clks); i++) 842 imx_check_clocks(clks, ARRAY_SIZE(clks));
843 if (IS_ERR(clks[i]))
844 pr_err("i.MX7D clk %d: register failed with %ld\n",
845 i, PTR_ERR(clks[i]));
846 843
847 clk_data.clks = clks; 844 clk_data.clks = clks;
848 clk_data.clk_num = ARRAY_SIZE(clks); 845 clk_data.clk_num = ARRAY_SIZE(clks);