Skip to content

Commit f46cf33

Browse files
committed
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
2 parents 92ed301 + 06a8a05 commit f46cf33

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/opp/core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_voltage);
118118
*/
119119
unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
120120
{
121-
if (IS_ERR_OR_NULL(opp) || !opp->available) {
121+
if (IS_ERR_OR_NULL(opp)) {
122122
pr_err("%s: Invalid parameters\n", __func__);
123123
return 0;
124124
}
@@ -2271,6 +2271,7 @@ int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
22712271
dev_pm_opp_put_opp_table(opp_table);
22722272
return r;
22732273
}
2274+
EXPORT_SYMBOL_GPL(dev_pm_opp_adjust_voltage);
22742275

22752276
/**
22762277
* dev_pm_opp_enable() - Enable a specific OPP

drivers/opp/ti-opp-supply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2016-2017 Texas Instruments Incorporated - http://www.ti.com/
3+
* Copyright (C) 2016-2017 Texas Instruments Incorporated - https://www.ti.com/
44
* Nishanth Menon <[email protected]>
55
* Dave Gerlach <[email protected]>
66
*

0 commit comments

Comments
 (0)