Commit 2f840689 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pm-4.20-rc5' of git://

Pull power management fixes from Rafael Wysocki:
 "These fix two issues in the operating performance points (OPP)


   - Fix the handling of the "operating-points-v2" property to avoid
     failures if multiple phandles are present in it which is legitimate
     (Viresh Kumar).

   - Drop the unnecessary static initialization of the .owner field in
     the ti_opp_supply_driver structure (YueHaibing)"

* tag 'pm-4.20-rc5' of git://
  OPP: Fix parsing of multiple phandles in "operating-points-v2" property
  opp: ti-opp-supply: Fix platform_no_drv_owner.cocci warnings
parents f92a2ebb 36c3aeb4
......@@ -579,9 +579,7 @@ 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;
if (count == 1)
index = 0;
......@@ -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),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment