diff options
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 7c75ab88f9b..815d6df8bd5 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3673,9 +3673,8 @@ regulator_register(const struct regulator_desc *regulator_desc, add_dev: /* add consumers devices */ - if (init_data) { - for (i = 0; i < init_data->num_consumer_supplies; i++) { + for (i = 0; i < init_data->num_consumer_supplies; i++) { ret = set_consumer_device_supply(rdev, init_data->consumer_supplies[i].dev_name, init_data->consumer_supplies[i].supply); @@ -3685,14 +3684,13 @@ add_dev: goto unset_supplies; } } - } + } list_add(&rdev->list, ®ulator_list); rdev_init_debugfs(rdev); out: mutex_unlock(®ulator_list_mutex); - return rdev; unset_supplies: @@ -3712,8 +3710,7 @@ wash: clean: kfree(rdev); rdev = ERR_PTR(ret); - - goto out; + goto out; } EXPORT_SYMBOL_GPL(regulator_register); @@ -3983,12 +3980,8 @@ static int __init regulator_init_complete(void) * with DT to provide them just assume that a DT enabled * system has full constraints. */ - -#if 0 - // TODO OLIO: This assumption isn't true for us. Not yet, at least. if (of_have_populated_dt()) has_full_constraints = true; -#endif mutex_lock(®ulator_list_mutex); |