OMAPDSS: CORE: use devm_regulator_get
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 3 May 2013 10:35:07 +0000 (13:35 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 17 Jun 2013 11:00:44 +0000 (14:00 +0300)
Use devm_regulator_get() instead of regulator_get() to simplify code.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/dss/core.c

index 831abec..7b2df2f 100644 (file)
@@ -88,7 +88,7 @@ struct regulator *dss_get_vdds_dsi(void)
        if (core.vdds_dsi_reg != NULL)
                return core.vdds_dsi_reg;
 
-       reg = regulator_get(&core.pdev->dev, "vdds_dsi");
+       reg = devm_regulator_get(&core.pdev->dev, "vdds_dsi");
        if (!IS_ERR(reg))
                core.vdds_dsi_reg = reg;
 
@@ -102,7 +102,7 @@ struct regulator *dss_get_vdds_sdi(void)
        if (core.vdds_sdi_reg != NULL)
                return core.vdds_sdi_reg;
 
-       reg = regulator_get(&core.pdev->dev, "vdds_sdi");
+       reg = devm_regulator_get(&core.pdev->dev, "vdds_sdi");
        if (!IS_ERR(reg))
                core.vdds_sdi_reg = reg;
 
@@ -664,16 +664,6 @@ static int __init omap_dss_init(void)
 
 static void __exit omap_dss_exit(void)
 {
-       if (core.vdds_dsi_reg != NULL) {
-               regulator_put(core.vdds_dsi_reg);
-               core.vdds_dsi_reg = NULL;
-       }
-
-       if (core.vdds_sdi_reg != NULL) {
-               regulator_put(core.vdds_sdi_reg);
-               core.vdds_sdi_reg = NULL;
-       }
-
        omap_dss_unregister_drivers();
 
        omap_dss_bus_unregister();