diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-26 10:13:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-26 10:13:28 +0100 |
| commit | 36c3aeb4b48d5b058526d606fde14db4fd7e5e6d (patch) | |
| tree | 4a6424a34b956846a050ee13d94d463404f981d5 | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
| parent | 3e27c79c4b121a64e85f26ab8957e5d0a09ff28e (diff) | |
Merge branch 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pmpm-4.20-rc5
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
| -rw-r--r-- | drivers/opp/of.c | 6 | ||||
| -rw-r--r-- | drivers/opp/ti-opp-supply.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 5a4b47958073..38a08805a30c 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -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); diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c index 3f4fb4dbbe33..1c69c404df11 100644 --- a/drivers/opp/ti-opp-supply.c +++ b/drivers/opp/ti-opp-supply.c @@ -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), }, }; |