drm/vc4: Rename bridge to out_bridge

In preparation for converting the encoder to being a bridge,
rename the variable holding the next bridge in the chain to
out_bridge, so that our bridge can be called bridge.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index cf924bf982cedc9cdeaa853eceaa65348b1457b7..515d195fdc3db1321ce1e6c18dafc7f38068b5a3 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -553,7 +553,7 @@ struct vc4_dsi {
 
        struct mipi_dsi_host dsi_host;
        struct drm_encoder *encoder;
-       struct drm_bridge *bridge;
+       struct drm_bridge *out_bridge;
        struct list_head bridge_chain;
 
        void __iomem *regs;
@@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(struct drm_encoder *encoder)
                if (iter->funcs->disable)
                        iter->funcs->disable(iter);
 
-               if (iter == dsi->bridge)
+               if (iter == dsi->out_bridge)
                        break;
        }
 
@@ -1667,7 +1667,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
        }
 
        ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
-                                         &panel, &dsi->bridge);
+                                         &panel, &dsi->out_bridge);
        if (ret) {
                /* If the bridge or panel pointed by dev->of_node is not
                 * enabled, just return 0 here so that we don't prevent the DRM
@@ -1682,10 +1682,10 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
        }
 
        if (panel) {
-               dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,
-                                                             DRM_MODE_CONNECTOR_DSI);
-               if (IS_ERR(dsi->bridge)) {
-                       ret = PTR_ERR(dsi->bridge);
+               dsi->out_bridge = devm_drm_panel_bridge_add_typed(dev, panel,
+                                                                 DRM_MODE_CONNECTOR_DSI);
+               if (IS_ERR(dsi->out_bridge)) {
+                       ret = PTR_ERR(dsi->out_bridge);
                        goto err_free_dma;
                }
        }
@@ -1704,7 +1704,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
        drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
        drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
 
-       ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
+       ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
        if (ret) {
                dev_err(dev, "bridge attach failed: %d\n", ret);
                goto err_free_dma;
@@ -1741,7 +1741,7 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,
 {
        struct vc4_dsi *dsi = dev_get_drvdata(dev);
 
-       if (dsi->bridge)
+       if (dsi->out_bridge)
                pm_runtime_disable(dev);
 
        /*