[media] media: soc-camera: use managed devm_regulator_bulk_get()
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Thu, 27 Sep 2012 09:40:30 +0000 (06:40 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 20 Dec 2012 16:23:57 +0000 (14:23 -0200)
Using device-managed devm_regulator_bulk_get() eliminates the need to
release regulators explicitly.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/soc_camera/soc_camera.c

index 54da3a5..a8ca956 100644 (file)
@@ -1139,8 +1139,8 @@ static int soc_camera_probe(struct soc_camera_device *icd)
        if (ret < 0)
                return ret;
 
-       ret = regulator_bulk_get(icd->pdev, icl->num_regulators,
-                                icl->regulators);
+       ret = devm_regulator_bulk_get(icd->pdev, icl->num_regulators,
+                                     icl->regulators);
        if (ret < 0)
                goto ereg;
 
@@ -1244,7 +1244,6 @@ eadddev:
 evdc:
        ici->ops->remove(icd);
 eadd:
-       regulator_bulk_free(icl->num_regulators, icl->regulators);
 ereg:
        v4l2_ctrl_handler_free(&icd->ctrl_handler);
        return ret;
@@ -1278,8 +1277,6 @@ static int soc_camera_remove(struct soc_camera_device *icd)
        }
        soc_camera_free_user_formats(icd);
 
-       regulator_bulk_free(icl->num_regulators, icl->regulators);
-
        return 0;
 }