Skip to content

Commit 29b1a92

Browse files
committed
OPP: Handle all genpd cases together in _set_required_opps()
There is no real need of keeping separate code for single genpd case, it can be made to work with a simple change. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent e9eadc2 commit 29b1a92

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

drivers/opp/core.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,8 @@ static int _set_required_opps(struct device *dev,
959959
struct dev_pm_opp *opp, bool up)
960960
{
961961
struct opp_table **required_opp_tables = opp_table->required_opp_tables;
962-
struct device **genpd_virt_devs = opp_table->genpd_virt_devs;
962+
struct device **genpd_virt_devs =
963+
opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev;
963964
int i, ret = 0;
964965

965966
if (!required_opp_tables)
@@ -979,12 +980,6 @@ static int _set_required_opps(struct device *dev,
979980
return -ENOENT;
980981
}
981982

982-
/* Single genpd case */
983-
if (!genpd_virt_devs)
984-
return _set_required_opp(dev, dev, opp, 0);
985-
986-
/* Multiple genpd case */
987-
988983
/*
989984
* Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev
990985
* after it is freed from another thread.

0 commit comments

Comments
 (0)