From: Viresh Kumar viresh.kumar@linaro.org
[ Upstream commit b23dfa3543f31fbb8c0098925bf90fc23193d17a ]
Reorder the code a bit to make it more readable. Add additional comment as well.
Tested-by: Marek Szyprowski m.szyprowski@samsung.com Acked-by: Clément Péron peron.clem@gmail.com Tested-by: Clément Péron peron.clem@gmail.com Signed-off-by: Viresh Kumar viresh.kumar@linaro.org Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/opp/core.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 195fcaff18448..2d3880b3d6ee0 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -817,15 +817,21 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) }
if (unlikely(!target_freq)) { - if (opp_table->required_opp_tables) { - ret = _set_required_opps(dev, opp_table, NULL); - } else if (!_get_opp_count(opp_table)) { + /* + * Some drivers need to support cases where some platforms may + * have OPP table for the device, while others don't and + * opp_set_rate() just needs to behave like clk_set_rate(). + */ + if (!_get_opp_count(opp_table)) return 0; - } else { + + if (!opp_table->required_opp_tables) { dev_err(dev, "target frequency can't be 0\n"); ret = -EINVAL; + goto put_opp_table; }
+ ret = _set_required_opps(dev, opp_table, NULL); goto put_opp_table; }