lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 162/252] opp: Don't print an error if required-opps is missing
    Date
    From: Rajendra Nayak <rnayak@codeaurora.org>

    [ Upstream commit 020d86fc0df8b865f6dc168d88a7c2dccabd0a9e ]

    The 'required-opps' property is considered optional, hence remove
    the pr_err() in of_parse_required_opp() when we find the property is
    missing.
    While at it, also fix the return value of
    of_get_required_opp_performance_state() when of_parse_required_opp()
    fails, return a -ENODEV instead of the -EINVAL.

    Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
    Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
    Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/opp/of.c | 12 ++----------
    1 file 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)) {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 13:57    [W:2.447 / U:0.904 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site