drm/mediatek: mtk_dsi: Rename bridge to next_bridge

This is really a cosmetic change just to make a bit more readable the
code after convert the driver to drm_bridge. The bridge variable name
will be used by the encoder drm_bridge, and the chained bridge will be
named next_bridge.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 02ac55c13a80bbcf84d8488d93842660bb3d67ec..f0c5434344ca249a8990b18645b8b31c65b80e6d 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -183,7 +183,7 @@ struct mtk_dsi {
        struct drm_encoder encoder;
        struct drm_connector conn;
        struct drm_panel *panel;
-       struct drm_bridge *bridge;
+       struct drm_bridge *next_bridge;
        struct phy *phy;
 
        void __iomem *regs;
@@ -891,9 +891,10 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi)
         */
        dsi->encoder.possible_crtcs = 1;
 
-       /* If there's a bridge, attach to it and let it create the connector */
-       if (dsi->bridge) {
-               ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL, 0);
+       /* If there's a next bridge, attach to it and let it create the connector */
+       if (dsi->next_bridge) {
+               ret = drm_bridge_attach(&dsi->encoder, dsi->next_bridge, NULL,
+                                       0);
                if (ret) {
                        DRM_ERROR("Failed to attach bridge to drm\n");
                        goto err_encoder_cleanup;
@@ -1174,7 +1175,7 @@ static int mtk_dsi_probe(struct platform_device *pdev)
        }
 
        ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
-                                         &dsi->panel, &dsi->bridge);
+                                         &dsi->panel, &dsi->next_bridge);
        if (ret)
                goto err_unregister_host;