]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm/exynos/hdmi: use optional regulator_get for hdmi-en
authorAndrzej Hajda <a.hajda@samsung.com>
Fri, 25 Sep 2015 12:48:21 +0000 (14:48 +0200)
committerInki Dae <daeinki@gmail.com>
Mon, 26 Oct 2015 06:09:43 +0000 (15:09 +0900)
hdmi-en is an optional regulator so it should be better handled by
devm_regulator_get_optional call.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_hdmi.c

index 725ddb58a624e73e36d03c2f7c9bcfa21a0ed9d8..841470ca7c773971d9168c037f83f408bf8b4bc1 100644 (file)
@@ -1803,19 +1803,17 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
        }
        res->regul_count = ARRAY_SIZE(supply);
 
-       res->reg_hdmi_en = devm_regulator_get(dev, "hdmi-en");
-       if (IS_ERR(res->reg_hdmi_en) && PTR_ERR(res->reg_hdmi_en) != -ENOENT) {
-               DRM_ERROR("failed to get hdmi-en regulator\n");
+       res->reg_hdmi_en = devm_regulator_get_optional(dev, "hdmi-en");
+
+       if (PTR_ERR(res->reg_hdmi_en) == -ENODEV)
+               return 0;
+
+       if (IS_ERR(res->reg_hdmi_en))
                return PTR_ERR(res->reg_hdmi_en);
-       }
-       if (!IS_ERR(res->reg_hdmi_en)) {
-               ret = regulator_enable(res->reg_hdmi_en);
-               if (ret) {
-                       DRM_ERROR("failed to enable hdmi-en regulator\n");
-                       return ret;
-               }
-       } else
-               res->reg_hdmi_en = NULL;
+
+       ret = regulator_enable(res->reg_hdmi_en);
+       if (ret)
+               DRM_ERROR("failed to enable hdmi-en regulator\n");
 
        return ret;
 fail:
@@ -2050,7 +2048,7 @@ static int hdmi_remove(struct platform_device *pdev)
 
        pm_runtime_disable(&pdev->dev);
 
-       if (hdata->res.reg_hdmi_en)
+       if (!IS_ERR(hdata->res.reg_hdmi_en))
                regulator_disable(hdata->res.reg_hdmi_en);
 
        if (hdata->hdmiphy_port)