diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-29 15:07:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-29 15:07:30 -0800 |
| commit | 2f8406891fed8be5aa5f535b7b5c37bba3272b1a (patch) | |
| tree | d7a2a2eb65fd2d59b1e9c7d65081346dab55432f | |
| parent | f92a2ebb3d5588720a33d4f22d55b4ba24f94da6 (diff) | |
| parent | 36c3aeb4b48d5b058526d606fde14db4fd7e5e6d (diff) | |
| download | linux-2f8406891fed8be5aa5f535b7b5c37bba3272b1a.tar.gz | |
Merge tag 'pm-4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These fix two issues in the operating performance points (OPP)
framework.
Specifics:
- 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://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-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 5a4b47958073e..38a08805a30c6 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 3f4fb4dbbe33b..1c69c404df114 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), }, }; |