[PATCH v8 4/7] drm/msm/dp: move parser->parse() and dp_power_client_init() to probe

[Kuogee Hsieh]

Original both parser->parse() and dp_power_client_init() are done at
dp_display_bind() since eDP population is done at binding time.
In the preparation of having eDP population done at probe() time,
move both function from dp_display_bind() to dp_display_probe().

Changes in v6:
-- move dp_power_client_deinit() to remove()

Changes in v5:
-- explain why parser->parse() and dp_power_client_init() are moved to
   probe time
-- tear down sub modules if failed

Changes in v4:
-- split this patch out of "incorporate pm_runtime framework into DP
   driver" patch

Signed-off-by: Kuogee Hsieh <quic_khs...@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
b/drivers/gpu/drm/msm/dp/dp_display.c
index c2e3247..a99a786 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -275,11 +275,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
        dp->dp_display.drm_dev = drm;
        priv->dp[dp->id] = &dp->dp_display;
 
-       rc = dp->parser->parse(dp->parser);
-       if (rc) {
-               DRM_ERROR("device tree parsing failed\n");
-               goto end;
-       }
 
 
        dp->drm_dev = drm;
@@ -290,11 +285,6 @@ static int dp_display_bind(struct device *dev, struct 
device *master,
                goto end;
        }
 
-       rc = dp_power_client_init(dp->power);
-       if (rc) {
-               DRM_ERROR("Power client create failed\n");
-               goto end;
-       }
 
        rc = dp_register_audio_driver(dev, dp->audio);
        if (rc) {
@@ -327,7 +317,6 @@ static void dp_display_unbind(struct device *dev, struct 
device *master,
 
        of_dp_aux_depopulate_bus(dp->aux);
 
-       dp_power_client_deinit(dp->power);
        dp_unregister_audio_driver(dev, dp->audio);
        dp_aux_unregister(dp->aux);
        dp->drm_dev = NULL;
@@ -1241,6 +1230,18 @@ static int dp_display_probe(struct platform_device *pdev)
                return -EPROBE_DEFER;
        }
 
+       rc = dp->parser->parse(dp->parser);
+       if (rc) {
+               DRM_ERROR("device tree parsing failed\n");
+               goto err;
+       }
+
+       rc = dp_power_client_init(dp->power);
+       if (rc) {
+               DRM_ERROR("Power client create failed\n");
+               goto err;
+       }
+
        /* setup event q */
        mutex_init(&dp->event_mutex);
        init_waitqueue_head(&dp->event_q);
@@ -1275,6 +1276,7 @@ static void dp_display_remove(struct platform_device 
*pdev)
        struct dp_display_private *dp = dev_get_dp_display_private(&pdev->dev);
 
        component_del(&pdev->dev, &dp_display_comp_ops);
+       dp_power_client_deinit(dp->power);
        dp_display_deinit_sub_modules(dp);
 
        platform_set_drvdata(pdev, NULL);
-- 
2.7.4