Commit a1ea1fb4 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman

OPP: Use opp_table->regulators to verify no regulator case

[ Upstream commit 90e3577b ]

The value of opp_table->regulator_count is not very consistent right now
and it may end up being 0 while we do have a "opp-microvolt" property in
the OPP table. It was kept that way as we used to check if any
regulators are set with the OPP core for a device or not using value of
regulator_count.

Lets use opp_table->regulators for that purpose as the meaning of
regulator_count is going to change in the later patches.
Reported-by: default avatarQuentin Perret <quentin.perret@arm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4c67633d
...@@ -191,12 +191,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev) ...@@ -191,12 +191,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
if (IS_ERR(opp_table)) if (IS_ERR(opp_table))
return 0; return 0;
count = opp_table->regulator_count;
/* Regulator may not be required for the device */ /* Regulator may not be required for the device */
if (!count) if (!opp_table->regulators)
goto put_opp_table; goto put_opp_table;
count = opp_table->regulator_count;
uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL); uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL);
if (!uV) if (!uV)
goto put_opp_table; goto put_opp_table;
...@@ -976,6 +976,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp, ...@@ -976,6 +976,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
struct regulator *reg; struct regulator *reg;
int i; int i;
if (!opp_table->regulators)
return true;
for (i = 0; i < opp_table->regulator_count; i++) { for (i = 0; i < opp_table->regulator_count; i++) {
reg = opp_table->regulators[i]; reg = opp_table->regulators[i];
...@@ -1263,7 +1266,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table) ...@@ -1263,7 +1266,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table)
struct dev_pm_set_opp_data *data; struct dev_pm_set_opp_data *data;
int len, count = opp_table->regulator_count; int len, count = opp_table->regulator_count;
if (WARN_ON(!count)) if (WARN_ON(!opp_table->regulators))
return -EINVAL; return -EINVAL;
/* space for set_opp_data */ /* space for set_opp_data */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment