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

Commit 31cbb57d authored by Bai Ping's avatar Bai Ping Committed by Shawn Guo
Browse files

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: default avatarBai Ping <b51503@freescale.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent fdb868cd

drivers/clk/imx/clk-imx6ul.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -399,9 +399,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) 
	/* mask handshake of mmdc */

	/* mask handshake of mmdc */

	writel_relaxed(BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR);

	writel_relaxed(BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR);





	for (i = 0; i < ARRAY_SIZE(clks); i++)

	imx_check_clocks(clks, ARRAY_SIZE(clks));

		if (IS_ERR(clks[i]))

			pr_err("i.MX6UL clk %d: register failed with %ld\n", i, PTR_ERR(clks[i]));





	clk_data.clks = clks;

	clk_data.clks = clks;

	clk_data.clk_num = ARRAY_SIZE(clks);

	clk_data.clk_num = ARRAY_SIZE(clks);

drivers/clk/imx/clk-imx7d.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -839,10 +839,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) 
					 clks[IMX7D_PLL_ARM_MAIN_CLK],

					 clks[IMX7D_PLL_ARM_MAIN_CLK],

					 clks[IMX7D_PLL_SYS_MAIN_CLK]);

					 clks[IMX7D_PLL_SYS_MAIN_CLK]);





	for (i = 0; i < ARRAY_SIZE(clks); i++)

	imx_check_clocks(clks, ARRAY_SIZE(clks));

		if (IS_ERR(clks[i]))

			pr_err("i.MX7D clk %d: register failed with %ld\n",

					i, PTR_ERR(clks[i]));





	clk_data.clks = clks;

	clk_data.clks = clks;

	clk_data.clk_num = ARRAY_SIZE(clks);

	clk_data.clk_num = ARRAY_SIZE(clks);