Skip to content

Commit

Permalink
Merge branch 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/kernel/git/vireshk/pm

Pull operating performance points (OPP) framework fixes for 4.20-rc5
from Viresh Kumar.

* 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  OPP: Fix parsing of multiple phandles in "operating-points-v2" property
  opp: ti-opp-supply: Fix platform_no_drv_owner.cocci warnings
  • Loading branch information
Rafael J. Wysocki committed Nov 26, 2018
2 parents 2e6e902 + 3e27c79 commit 36c3aeb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions drivers/opp/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,10 +579,8 @@ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index)
*/
count = of_count_phandle_with_args(dev->of_node,
"operating-points-v2", NULL);
if (count != 1)
return -ENODEV;

index = 0;
if (count == 1)
index = 0;
}

opp_table = dev_pm_opp_get_opp_table_indexed(dev, index);
Expand Down
1 change: 0 additions & 1 deletion drivers/opp/ti-opp-supply.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ static struct platform_driver ti_opp_supply_driver = {
.probe = ti_opp_supply_probe,
.driver = {
.name = "ti_opp_supply",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(ti_opp_supply_of_match),
},
};
Expand Down

0 comments on commit 36c3aeb

Please sign in to comment.