diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-02-14 15:27:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-02-14 15:27:41 +0100 |
| commit | 99537067aca7e2826bffc514c241e3ce76dc22eb (patch) | |
| tree | b5b5ab47e3f294927783b2bf4c380f74b9bc0007 /drivers | |
| parent | ceaa837f96adb69c0df0397937cd74991d5d821a (diff) | |
| parent | eca4c0eea53432ec4b711b2a8ad282cbad231b4f (diff) | |
| download | linux-next-99537067aca7e2826bffc514c241e3ce76dc22eb.tar.gz linux-next-99537067aca7e2826bffc514c241e3ce76dc22eb.zip | |
Merge tag 'opp-updates-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull OPP (Operating Performance Points) updates for 6.3 from Viresh
Kumar:
"- Add missing 'cache-unified' property in example for kryo OPP bindings
(Rob Herring).
- Fix error checking in opp_migrate_dentry() (Qi Zheng).
- Remove "select SRCU" (Paul E. McKenney).
- Let qcom,opp-fuse-level be a 2-long array for qcom SoCs (Konrad
Dybcio)."
* tag 'opp-updates-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
OPP: fix error checking in opp_migrate_dentry()
dt-bindings: opp: v2-qcom-level: Let qcom,opp-fuse-level be a 2-long array
drivers/opp: Remove "select SRCU"
dt-bindings: opp: opp-v2-kryo-cpu: Add missing 'cache-unified' property in example
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/opp/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/opp/debugfs.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/opp/Kconfig b/drivers/opp/Kconfig index e8ce47b32735..d7c649a1a981 100644 --- a/drivers/opp/Kconfig +++ b/drivers/opp/Kconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only config PM_OPP bool - select SRCU help SOCs have a standard set of tuples consisting of frequency and voltage pairs that the device will support per voltage domain. This diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c index 96a30a032c5f..2c7fb683441e 100644 --- a/drivers/opp/debugfs.c +++ b/drivers/opp/debugfs.c @@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir, opp_table->dentry_name); - if (!dentry) { + if (IS_ERR(dentry)) { dev_err(dev, "%s: Failed to rename link from: %s to %s\n", __func__, dev_name(opp_dev->dev), dev_name(dev)); return; |