drm/msm/dp: switch to devm_drm_bridge_add()

Make MSM DP driver use devm_drm_bridge_add() instead of plain
drm_bridge_add(). As the driver doesn't require any additional cleanup,
stop adding created bridge to the priv->bridges array.

Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/561639/
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index c7f77cb06fccf72a74a91a6c1595cffe0c009c0a..17bfa72727aaceaa1cc81501301f48e900fb8665 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1532,7 +1532,6 @@ error:
 int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
                        struct drm_encoder *encoder)
 {
-       struct msm_drm_private *priv = dev->dev_private;
        struct dp_display_private *dp_priv;
        int ret;
 
@@ -1550,17 +1549,13 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
        if (ret)
                return ret;
 
-       dp_display->bridge = dp_bridge_init(dp_display, dev, encoder);
-       if (IS_ERR(dp_display->bridge)) {
-               ret = PTR_ERR(dp_display->bridge);
+       ret = dp_bridge_init(dp_display, dev, encoder);
+       if (ret) {
                DRM_DEV_ERROR(dev->dev,
                        "failed to create dp bridge: %d\n", ret);
-               dp_display->bridge = NULL;
                return ret;
        }
 
-       priv->bridges[priv->num_bridges++] = dp_display->bridge;
-
        dp_display->connector = dp_drm_connector_init(dp_display, encoder);
        if (IS_ERR(dp_display->connector)) {
                ret = PTR_ERR(dp_display->connector);

diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 785d76639497d9fbb4c11c75de0a505a40b6f8e8..284ff7df058aa79c3f203ff196a7ff8dadb6f04f 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -272,7 +272,7 @@ static const struct drm_bridge_funcs edp_bridge_ops = {
        .atomic_check = edp_bridge_atomic_check,
 };
 
-struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
+int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
                        struct drm_encoder *encoder)
 {
        int rc;
@@ -281,7 +281,7 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
 
        dp_bridge = devm_kzalloc(dev->dev, sizeof(*dp_bridge), GFP_KERNEL);
        if (!dp_bridge)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        dp_bridge->dp_display = dp_display;
 
@@ -307,14 +307,18 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
                        DRM_BRIDGE_OP_MODES;
        }
 
-       drm_bridge_add(bridge);
+       rc = devm_drm_bridge_add(&dp_display->pdev->dev, bridge);
+       if (rc) {
+               DRM_ERROR("failed to add bridge, rc=%d\n", rc);
+
+               return rc;
+       }
 
        rc = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
        if (rc) {
                DRM_ERROR("failed to attach bridge, rc=%d\n", rc);
-               drm_bridge_remove(bridge);
 
-               return ERR_PTR(rc);
+               return rc;
        }
 
        if (dp_display->next_bridge) {
@@ -323,12 +327,13 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
                                        DRM_BRIDGE_ATTACH_NO_CONNECTOR);
                if (rc < 0) {
                        DRM_ERROR("failed to attach panel bridge: %d\n", rc);
-                       drm_bridge_remove(bridge);
-                       return ERR_PTR(rc);
+                       return rc;
                }
        }
 
-       return bridge;
+       dp_display->bridge = bridge;
+
+       return 0;
 }
 
 /* connector initialization */

diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h
index afe79b85e183dc08125e9d6574728ad1f99ebcd1..b3d684db2383b9aff103699b8c06bcb9d5789168 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_drm.h
+++ b/drivers/gpu/drm/msm/dp/dp_drm.h
@@ -20,7 +20,7 @@ struct msm_dp_bridge {
 #define to_dp_bridge(x)     container_of((x), struct msm_dp_bridge, bridge)
 
 struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder);
-struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
+int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
                        struct drm_encoder *encoder);
 
 void dp_bridge_atomic_enable(struct drm_bridge *drm_bridge,