Commit c2ab2cb6 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Use generic key finding helpers for level key 



Use the recently added generic key findings helpers to find level key
values.

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

drivers/opp/core.c

+10 −53
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ static unsigned long _read_freq(struct dev_pm_opp *opp, int index) 
	return opp->rate;

}



static unsigned long _read_level(struct dev_pm_opp *opp, int index)

{

	return opp->level;

}



/* Generic comparison helpers */

static bool _compare_exact(struct dev_pm_opp **opp, struct dev_pm_opp *temp_opp,

			   unsigned long opp_key, unsigned long key)
@@ -656,33 +661,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor); 
struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,

					       unsigned int level)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table)) {

		int r = PTR_ERR(opp_table);



		dev_err(dev, "%s: OPP table not found (%d)\n", __func__, r);

		return ERR_PTR(r);

	}



	mutex_lock(&opp_table->lock);



	list_for_each_entry(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->level == level) {

			opp = temp_opp;



			/* Increment the reference count of OPP */

			dev_pm_opp_get(opp);

			break;

		}

	}



	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);



	return opp;

	return _find_key_exact(dev, level, 0, true, _read_level);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact);
@@ -704,33 +683,11 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact); 
struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,

					      unsigned int *level)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table)) {

		int r = PTR_ERR(opp_table);



		dev_err(dev, "%s: OPP table not found (%d)\n", __func__, r);

		return ERR_PTR(r);

	}



	mutex_lock(&opp_table->lock);



	list_for_each_entry(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->available && temp_opp->level >= *level) {

			opp = temp_opp;

			*level = opp->level;



			/* Increment the reference count of OPP */

			dev_pm_opp_get(opp);

			break;

		}

	}



	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);

	unsigned long temp = *level;

	struct dev_pm_opp *opp;



	opp = _find_key_ceil(dev, &temp, 0, true, _read_level);

	*level = temp;

	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil);