lkml.org 
[lkml]   [2022]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/8] OPP: Remove rate_not_available parameter to _opp_add()
    Date
    commit 32715be4fe95 ("opp: Fix adding OPP entries in a wrong order if
    rate is unavailable") removed the only user of this field, get rid of
    rest of it now.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    drivers/opp/core.c | 4 ++--
    drivers/opp/of.c | 10 ++++------
    drivers/opp/opp.h | 2 +-
    3 files changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/opp/core.c b/drivers/opp/core.c
    index 404f43759066..fe447f41c99e 100644
    --- a/drivers/opp/core.c
    +++ b/drivers/opp/core.c
    @@ -1695,7 +1695,7 @@ void _required_opps_available(struct dev_pm_opp *opp, int count)
    * should be considered an error by the callers of _opp_add().
    */
    int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
    - struct opp_table *opp_table, bool rate_not_available)
    + struct opp_table *opp_table)
    {
    struct list_head *head;
    int ret;
    @@ -1774,7 +1774,7 @@ int _opp_add_v1(struct opp_table *opp_table, struct device *dev,
    new_opp->available = true;
    new_opp->dynamic = dynamic;

    - ret = _opp_add(dev, new_opp, opp_table, false);
    + ret = _opp_add(dev, new_opp, opp_table);
    if (ret) {
    /* Don't return error for duplicate OPPs */
    if (ret == -EBUSY)
    diff --git a/drivers/opp/of.c b/drivers/opp/of.c
    index e07fc31de416..bec9644a7260 100644
    --- a/drivers/opp/of.c
    +++ b/drivers/opp/of.c
    @@ -808,8 +808,8 @@ static int _read_bw(struct dev_pm_opp *new_opp, struct opp_table *opp_table,
    return ret;
    }

    -static int _read_opp_key(struct dev_pm_opp *new_opp, struct opp_table *opp_table,
    - struct device_node *np, bool *rate_not_available)
    +static int _read_opp_key(struct dev_pm_opp *new_opp,
    + struct opp_table *opp_table, struct device_node *np)
    {
    bool found = false;
    u64 rate;
    @@ -825,7 +825,6 @@ static int _read_opp_key(struct dev_pm_opp *new_opp, struct opp_table *opp_table
    new_opp->rate = (unsigned long)rate;
    found = true;
    }
    - *rate_not_available = !!ret;

    /*
    * Bandwidth consists of peak and average (optional) values:
    @@ -881,13 +880,12 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
    struct dev_pm_opp *new_opp;
    u32 val;
    int ret;
    - bool rate_not_available = false;

    new_opp = _opp_allocate(opp_table);
    if (!new_opp)
    return ERR_PTR(-ENOMEM);

    - ret = _read_opp_key(new_opp, opp_table, np, &rate_not_available);
    + ret = _read_opp_key(new_opp, opp_table, np);
    if (ret < 0) {
    dev_err(dev, "%s: opp key field not found\n", __func__);
    goto free_opp;
    @@ -920,7 +918,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
    if (opp_table->is_genpd)
    new_opp->pstate = pm_genpd_opp_to_performance_state(dev, new_opp);

    - ret = _opp_add(dev, new_opp, opp_table, rate_not_available);
    + ret = _opp_add(dev, new_opp, opp_table);
    if (ret) {
    /* Don't return error for duplicate OPPs */
    if (ret == -EBUSY)
    diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
    index 407eee9f10ab..4d8894ef2975 100644
    --- a/drivers/opp/opp.h
    +++ b/drivers/opp/opp.h
    @@ -226,7 +226,7 @@ struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_
    struct dev_pm_opp *_opp_allocate(struct opp_table *opp_table);
    void _opp_free(struct dev_pm_opp *opp);
    int _opp_compare_key(struct dev_pm_opp *opp1, struct dev_pm_opp *opp2);
    -int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table, bool rate_not_available);
    +int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, struct opp_table *opp_table);
    int _opp_add_v1(struct opp_table *opp_table, struct device *dev, unsigned long freq, long u_volt, bool dynamic);
    void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, int last_cpu);
    struct opp_table *_add_opp_table_indexed(struct device *dev, int index, bool getclk);
    --
    2.31.1.272.g89b43f80a514
    \
     
     \ /
      Last update: 2022-06-10 10:26    [W:5.827 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site