Skip to content

Commit

Permalink
regulator: core: Don't defer probe if there's no DT binding for a supply
Browse files Browse the repository at this point in the history
When using device tree if there's no binding for a supply then there's no
way that one could appear later so just fail permanently right away. This
avoids wasting time trying to reprobe when that can never work.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Apr 3, 2012
1 parent 01e86f4 commit 6d191a5
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1169,19 +1169,29 @@ static int _regulator_get_enable_time(struct regulator_dev *rdev)
}

static struct regulator_dev *regulator_dev_lookup(struct device *dev,
const char *supply)
const char *supply,
int *ret)
{
struct regulator_dev *r;
struct device_node *node;

/* first do a dt based lookup */
if (dev && dev->of_node) {
node = of_get_regulator(dev, supply);
if (node)
if (node) {
list_for_each_entry(r, &regulator_list, list)
if (r->dev.parent &&
node == r->dev.of_node)
return r;
} else {
/*
* If we couldn't even get the node then it's
* not just that the device didn't register
* yet, there's no node and we'll never
* succeed.
*/
*ret = -ENODEV;
}
}

/* if not found, try doing it non-dt way */
Expand Down Expand Up @@ -1212,7 +1222,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,

mutex_lock(&regulator_list_mutex);

rdev = regulator_dev_lookup(dev, id);
rdev = regulator_dev_lookup(dev, id, &ret);
if (rdev)
goto found;

Expand Down Expand Up @@ -2926,7 +2936,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
if (supply) {
struct regulator_dev *r;

r = regulator_dev_lookup(dev, supply);
r = regulator_dev_lookup(dev, supply, &ret);

if (!r) {
dev_err(dev, "Failed to find supply %s\n", supply);
Expand Down

0 comments on commit 6d191a5

Please sign in to comment.