Commit 22079af7 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

opp: Reorder definition of ceil/floor helpers 



Reorder the helpers to keep all freq specific ones, followed by level
and bw.

No functional change.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 00ce3873

drivers/opp/core.c

+97 −97
Original line number Diff line number Diff line
@@ -456,103 +456,6 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);



/**

 * dev_pm_opp_find_level_exact() - search for an exact level

 * @dev:		device for which we do this operation

 * @level:		level to search for

 *

 * Return: Searches for exact match in the opp table and returns pointer to the

 * matching opp if found, else returns ERR_PTR in case of error and should

 * be handled using IS_ERR. Error return values can be:

 * EINVAL:	for bad pointer

 * ERANGE:	no match found for search

 * ENODEV:	if device not found in list of registered devices

 *

 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

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;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact);



/**

 * dev_pm_opp_find_level_ceil() - search for an rounded up level

 * @dev:		device for which we do this operation

 * @level:		level to search for

 *

 * Return: Searches for rounded up match in the opp table and returns pointer

 * to the  matching opp if found, else returns ERR_PTR in case of error and

 * should be handled using IS_ERR. Error return values can be:

 * EINVAL:	for bad pointer

 * ERANGE:	no match found for search

 * ENODEV:	if device not found in list of registered devices

 *

 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

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);



	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil);



static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,

						   unsigned long *freq)

{
@@ -729,6 +632,103 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil_by_volt(struct device *dev, 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil_by_volt);



/**

 * dev_pm_opp_find_level_exact() - search for an exact level

 * @dev:		device for which we do this operation

 * @level:		level to search for

 *

 * Return: Searches for exact match in the opp table and returns pointer to the

 * matching opp if found, else returns ERR_PTR in case of error and should

 * be handled using IS_ERR. Error return values can be:

 * EINVAL:	for bad pointer

 * ERANGE:	no match found for search

 * ENODEV:	if device not found in list of registered devices

 *

 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

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;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_exact);



/**

 * dev_pm_opp_find_level_ceil() - search for an rounded up level

 * @dev:		device for which we do this operation

 * @level:		level to search for

 *

 * Return: Searches for rounded up match in the opp table and returns pointer

 * to the  matching opp if found, else returns ERR_PTR in case of error and

 * should be handled using IS_ERR. Error return values can be:

 * EINVAL:	for bad pointer

 * ERANGE:	no match found for search

 * ENODEV:	if device not found in list of registered devices

 *

 * The callers are required to call dev_pm_opp_put() for the returned OPP after

 * use.

 */

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);



	return opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_level_ceil);



/**

 * dev_pm_opp_find_bw_ceil() - Search for a rounded ceil bandwidth

 * @dev:	device for which we do this operation

include/linux/pm_opp.h

+11 −11
Original line number Diff line number Diff line
@@ -117,16 +117,16 @@ unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev); 
struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					      unsigned long freq,

					      bool available);

struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,

					       unsigned int level);

struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,

					      unsigned int *level);



struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,

					      unsigned long *freq);

struct dev_pm_opp *dev_pm_opp_find_freq_ceil_by_volt(struct device *dev,

						     unsigned long u_volt);



struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,

					       unsigned int level);

struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,

					      unsigned int *level);



struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,

					     unsigned long *freq);
@@ -250,12 +250,6 @@ static inline unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev) 
	return 0;

}



static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					unsigned long freq, bool available)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,

					unsigned int level)

{
@@ -268,6 +262,12 @@ static inline struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev, 
	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,

					unsigned long freq, bool available)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,

					unsigned long *freq)

{