Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / regulator / devres.c

diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index 6ad8ab4c578d679ae753ec240b4ae518f6eb35ca..6ec1d400adae7e444102266385171c5d787110a3 100644 (file)
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -164,11 +164,8 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers,
                consumers[i].consumer = NULL;
 
        for (i = 0; i < num_consumers; i++) {
-               consumers[i].consumer = _devm_regulator_get(dev,
-                                                           consumers[i].supply,
-                                                           consumers[i].optional ?
-                                                               OPTIONAL_GET :
-                                                               NORMAL_GET);
+               consumers[i].consumer = devm_regulator_get(dev,
+                                                          consumers[i].supply);
                if (IS_ERR(consumers[i].consumer)) {
                        ret = PTR_ERR(consumers[i].consumer);
                        dev_err(dev, "Failed to get supply '%s': %d\n",