korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 05:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

PM / OPP: Initialize regulator pointer to an error value

Browse Source 
We are currently required to do two checks for regulator pointer:
IS_ERR() and IS_NULL().

And multiple instances are reported, about both of these not being used
consistently and so resulting in crashes.

Fix that by initializing regulator pointer with an error value and
checking it only against an error.

This makes code more consistent and more efficient.

Fixes: 7d34d56ef3 (PM / OPP: Disable OPPs that aren't supported by the regulator)
Reported-and-tested-by: Jon Hunter <jonathanh@nvidia.com>
Reported-and-tested-by: Tony Lindgren <tony@atomide.com>
Reported-and-tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
[ rjw: Initialize to -ENXIO ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar 2016-02-15 21:56:42 +05:30 committed by Rafael J. Wysocki
parent c88c395f4a
commit 0c717d0f9c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/base/power/opp/core.c
View File

@ -257,7 +257,7 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
} }
reg = dev_opp->regulator; reg = dev_opp->regulator;
if (IS_ERR_OR_NULL(reg)) { if (IS_ERR(reg)) {
/* Regulator may not be required for device */ /* Regulator may not be required for device */
if (reg) if (reg)
dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__, dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__,
@ -798,6 +798,9 @@ static struct device_opp *_add_device_opp(struct device *dev)
of_node_put(np); of_node_put(np);
} }
/* Set regulator to a non-NULL error value */
dev_opp->regulator = ERR_PTR(-ENXIO);
/* Find clk for the device */ /* Find clk for the device */
dev_opp->clk = clk_get(dev, NULL); dev_opp->clk = clk_get(dev, NULL);
if (IS_ERR(dev_opp->clk)) { if (IS_ERR(dev_opp->clk)) {
@ -845,7 +848,7 @@ static void _remove_device_opp(struct device_opp *dev_opp)
if (dev_opp->prop_name) if (dev_opp->prop_name)
return; return;
if (!IS_ERR_OR_NULL(dev_opp->regulator)) if (!IS_ERR(dev_opp->regulator))
return; return;
/* Release clk */ /* Release clk */
@ -975,7 +978,7 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
{ {
struct regulator *reg = dev_opp->regulator; struct regulator *reg = dev_opp->regulator;
if (!IS_ERR_OR_NULL(reg) && if (!IS_ERR(reg) &&
!regulator_is_supported_voltage(reg, opp->u_volt_min, !regulator_is_supported_voltage(reg, opp->u_volt_min,
opp->u_volt_max)) { opp->u_volt_max)) {
pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n", pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
@ -1441,7 +1444,7 @@ int dev_pm_opp_set_regulator(struct device *dev, const char *name)
} }
/* Already have a regulator set */ /* Already have a regulator set */
if (WARN_ON(!IS_ERR_OR_NULL(dev_opp->regulator))) { if (WARN_ON(!IS_ERR(dev_opp->regulator))) {
ret = -EBUSY; ret = -EBUSY;
goto err; goto err;
} }
@ -1492,7 +1495,7 @@ void dev_pm_opp_put_regulator(struct device *dev)
goto unlock; goto unlock;
} }
if (IS_ERR_OR_NULL(dev_opp->regulator)) { if (IS_ERR(dev_opp->regulator)) {
dev_err(dev, "%s: Doesn't have regulator set\n", __func__); dev_err(dev, "%s: Doesn't have regulator set\n", __func__);
goto unlock; goto unlock;
} }
@ -1501,7 +1504,7 @@ void dev_pm_opp_put_regulator(struct device *dev)
WARN_ON(!list_empty(&dev_opp->opp_list)); WARN_ON(!list_empty(&dev_opp->opp_list));
regulator_put(dev_opp->regulator); regulator_put(dev_opp->regulator);
dev_opp->regulator = ERR_PTR(-EINVAL); dev_opp->regulator = ERR_PTR(-ENXIO);
/* Try freeing device_opp if this was the last blocking resource */ /* Try freeing device_opp if this was the last blocking resource */
_remove_device_opp(dev_opp); _remove_device_opp(dev_opp);