Commit 4768914b authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Remove rate_not_available parameter to _opp_add() 



commit 32715be4 ("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.

Tested-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d6134583

drivers/opp/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1713,7 +1713,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;
@@ -1792,7 +1792,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)

drivers/opp/of.c

+4 −6
Original line number Diff line number Diff line
@@ -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)

drivers/opp/opp.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,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);