Commit 36c3aeb4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/linux/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
parents 2e6e902d 3e27c79c
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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;
	}

+0 −1
Original line number Diff line number Diff line
@@ -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),
		   },
};