1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 518667ef9a0d..a7c8deb5f28f 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -115,7 +115,9 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
         if (!pdata)
                 return -EINVAL;
 
-        drvdata = kzalloc(sizeof(struct userspace_consumer_data), GFP_KERNEL);
+        drvdata = devm_kzalloc(&pdev->dev,
+                               sizeof(struct userspace_consumer_data),
+                               GFP_KERNEL);
         if (drvdata == NULL)
                 return -ENOMEM;
 
@@ -125,16 +127,16 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 
         mutex_init(&drvdata->lock);
 
-        ret = regulator_bulk_get(&pdev->dev, drvdata->num_supplies,
-                                 drvdata->supplies);
+        ret = devm_regulator_bulk_get(&pdev->dev, drvdata->num_supplies,
+                                      drvdata->supplies);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to get supplies: %d\n", ret);
-                goto err_alloc_supplies;
+                return ret;
         }
 
         ret = sysfs_create_group(&pdev->dev.kobj, &attr_group);
         if (ret != 0)
-                goto err_create_attrs;
+                return ret;
 
         if (pdata->init_on) {
                 ret = regulator_bulk_enable(drvdata->num_supplies,
@@ -154,11 +156,6 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 err_enable:
         sysfs_remove_group(&pdev->dev.kobj, &attr_group);
 
-err_create_attrs:
-        regulator_bulk_free(drvdata->num_supplies, drvdata->supplies);
-
-err_alloc_supplies:
-        kfree(drvdata);
         return ret;
 }
 
@@ -171,9 +168,6 @@ static int regulator_userspace_consumer_remove(struct platform_device *pdev)
         if (data->enabled)
                 regulator_bulk_disable(data->num_supplies, data->supplies);
 
-        regulator_bulk_free(data->num_supplies, data->supplies);
-        kfree(data);
-
         return 0;
 }