evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PM / OPP: Allocate dev_opp from _add_device_opp()

Browse source 
There is no need to complicate _opp_add_dynamic() with allocation of
dev_opp as well. Allocate it from _add_device_opp() instead.

Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar 2015-07-29 16:23:00 +05:30 • committed by Rafael J. Wysocki
parent 3bac42caec
commit aa5f2f854f
1 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/base/power/opp.c
View file

@ -408,11 +408,11 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor); EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_floor);
/** /**
* _add_device_opp() - Allocate a new device OPP table * _add_device_opp() - Find device OPP table or allocate a new one
* @dev: device for which we do this operation * @dev: device for which we do this operation
* *
* New device node which uses OPPs - used when multiple devices with OPP tables * It tries to find an existing table first, if it couldn't find one, it
* are maintained. * allocates a new OPP table and returns that.
* *
* Return: valid device_opp pointer if success, else NULL. * Return: valid device_opp pointer if success, else NULL.
*/ */
@ -420,6 +420,11 @@ static struct device_opp *_add_device_opp(struct device *dev)
{ {
struct device_opp *dev_opp; struct device_opp *dev_opp;
/* Check for existing list for 'dev' first */
dev_opp = _find_device_opp(dev);
if (!IS_ERR(dev_opp))
return dev_opp;
/* /*
* Allocate a new device OPP table. In the infrequent case where a new * Allocate a new device OPP table. In the infrequent case where a new
* device is needed to be added, we pay this penalty. * device is needed to be added, we pay this penalty.
@ -575,7 +580,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_remove);
static int _opp_add_dynamic(struct device *dev, unsigned long freq, static int _opp_add_dynamic(struct device *dev, unsigned long freq,
long u_volt, bool dynamic) long u_volt, bool dynamic)
{ {
struct device_opp *dev_opp = NULL; struct device_opp *dev_opp;
struct dev_pm_opp *opp, *new_opp; struct dev_pm_opp *opp, *new_opp;
struct list_head *head; struct list_head *head;
int ret; int ret;
@ -592,19 +597,11 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq,
new_opp->rate = freq; new_opp->rate = freq;
new_opp->u_volt = u_volt; new_opp->u_volt = u_volt;
new_opp->available = true; new_opp->available = true;
new_opp->dynamic = dynamic;
/* Check for existing list for 'dev' */ dev_opp = _add_device_opp(dev);
dev_opp = _find_device_opp(dev); if (!dev_opp) {
if (IS_ERR(dev_opp)) { ret = -ENOMEM;
dev_opp = _add_device_opp(dev); goto free_opp;
if (!dev_opp) {
ret = -ENOMEM;
goto free_opp;
}
head = &dev_opp->opp_list;
goto list_add;
} }
/* /*
@ -612,15 +609,22 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq,
* and discard if already present * and discard if already present
*/ */
head = &dev_opp->opp_list; head = &dev_opp->opp_list;
list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) {
if (new_opp->rate <= opp->rate)
break;
else
head = &opp->node;
}
/* Duplicate OPPs ? */ /*
if (new_opp->rate == opp->rate) { * Need to use &dev_opp->opp_list in the condition part of the 'for'
* loop, don't replace it with head otherwise it will become an infinite
* loop.
*/
list_for_each_entry_rcu(opp, &dev_opp->opp_list, node) {
if (new_opp->rate > opp->rate) {
head = &opp->node;
continue;
}
if (new_opp->rate < opp->rate)
break;
/* Duplicate OPPs */
ret = opp->available && new_opp->u_volt == opp->u_volt ? ret = opp->available && new_opp->u_volt == opp->u_volt ?
0 : -EEXIST; 0 : -EEXIST;
@ -630,7 +634,7 @@ static int _opp_add_dynamic(struct device *dev, unsigned long freq,
goto free_opp; goto free_opp;
} }
list_add: new_opp->dynamic = dynamic;
new_opp->dev_opp = dev_opp; new_opp->dev_opp = dev_opp;
list_add_rcu(&new_opp->node, head); list_add_rcu(&new_opp->node, head);
mutex_unlock(&dev_opp_list_lock); mutex_unlock(&dev_opp_list_lock);