Commit 08b95756 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: Missing set_phase op is an error 



If a clock's clk_ops doesn't have the set_phase op set we should
return an error from clk_set_phase(). This way clock consumers
know that when they tried to set a phase it didn't work, as
opposed to the current behavior where the return value is 0
meaning success.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 6b547836

drivers/clk/clk.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -2123,10 +2123,10 @@ EXPORT_SYMBOL_GPL(clk_set_parent); 
 */

 */

int clk_set_phase(struct clk *clk, int degrees)

int clk_set_phase(struct clk *clk, int degrees)

{

{

	int ret = 0;

	int ret = -EINVAL;





	if (!clk)

	if (!clk)

		goto out;

		return 0;





	/* sanity check degrees */

	/* sanity check degrees */

	degrees %= 360;

	degrees %= 360;
@@ -2135,18 +2135,14 @@ int clk_set_phase(struct clk *clk, int degrees) 




	clk_prepare_lock();

	clk_prepare_lock();





	if (!clk->core->ops->set_phase)

	if (clk->core->ops->set_phase)

		goto out_unlock;



		ret = clk->core->ops->set_phase(clk->core->hw, degrees);

		ret = clk->core->ops->set_phase(clk->core->hw, degrees);





	if (!ret)

	if (!ret)

		clk->core->phase = degrees;

		clk->core->phase = degrees;





out_unlock:

	clk_prepare_unlock();

	clk_prepare_unlock();





out:

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(clk_set_phase);

EXPORT_SYMBOL_GPL(clk_set_phase);