diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-07-30 17:27:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-07-30 17:27:46 +0200 |
| commit | f46cf335311c2c414eb3c54e40d22a81e327bc26 (patch) | |
| tree | 6b114827b9e6418ab911e4f847ab5e199cdca8f2 | |
| parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
| parent | 06a8a059e88bd73ee81a4ad19e97c04766f84def (diff) | |
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull operating performance points (OPP) framework updates for v5.9
from Viresh Kumar:
"This contains following changes:
- Fix HTTP links (Alexander A. Klimov).
- Allow disabled OPPs in dev_pm_opp_get_freq() (Andrew-sh.Cheng).
- Add missing export (Valdis Kletnieks)."
* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
opp: Allow disabled OPPs in dev_pm_opp_get_freq()
opp: ti-opp-supply: Replace HTTP links with HTTPS ones
opp: core: Add missing export for dev_pm_opp_adjust_voltage
| -rw-r--r-- | drivers/opp/core.c | 3 | ||||
| -rw-r--r-- | drivers/opp/ti-opp-supply.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index dfbd3d10410c..0c8c74a3c868 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_voltage); */ unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp) { - if (IS_ERR_OR_NULL(opp) || !opp->available) { + if (IS_ERR_OR_NULL(opp)) { pr_err("%s: Invalid parameters\n", __func__); return 0; } @@ -2271,6 +2271,7 @@ adjust_put_table: dev_pm_opp_put_opp_table(opp_table); return r; } +EXPORT_SYMBOL_GPL(dev_pm_opp_adjust_voltage); /** * dev_pm_opp_enable() - Enable a specific OPP diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c index e3357e91decb..bd4771f388ab 100644 --- a/drivers/opp/ti-opp-supply.c +++ b/drivers/opp/ti-opp-supply.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2016-2017 Texas Instruments Incorporated - http://www.ti.com/ + * Copyright (C) 2016-2017 Texas Instruments Incorporated - https://www.ti.com/ * Nishanth Menon <nm@ti.com> * Dave Gerlach <d-gerlach@ti.com> * |