diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-08-30 19:20:32 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-08-30 19:20:32 +0200 |
| commit | bc0d0b1dfe27158c06c3a891953174d06b96a419 (patch) | |
| tree | ae35280e0b599b4a3dfeb4fdaf9b0f5b4eb6b200 /drivers/opp | |
| parent | 3c5a272202c28c1f9309566f206ba40787246149 (diff) | |
| parent | 656164181eece68a2f99f0b8a1c5558184b67d7b (diff) | |
Merge back new PM domains material for v5.15.
Diffstat (limited to 'drivers/opp')
| -rw-r--r-- | drivers/opp/of.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 67f2e0710e79..2a97c6535c4c 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -95,15 +95,7 @@ static struct dev_pm_opp *_find_opp_of_np(struct opp_table *opp_table, static struct device_node *of_parse_required_opp(struct device_node *np, int index) { - struct device_node *required_np; - - required_np = of_parse_phandle(np, "required-opps", index); - if (unlikely(!required_np)) { - pr_err("%s: Unable to parse required-opps: %pOF, index: %d\n", - __func__, np, index); - } - - return required_np; + return of_parse_phandle(np, "required-opps", index); } /* The caller must call dev_pm_opp_put_opp_table() after the table is used */ @@ -1328,7 +1320,7 @@ int of_get_required_opp_performance_state(struct device_node *np, int index) required_np = of_parse_required_opp(np, index); if (!required_np) - return -EINVAL; + return -ENODEV; opp_table = _find_table_of_opp_np(required_np); if (IS_ERR(opp_table)) { |