drm/mediatek: mtk_dpi: 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 <[email protected]>
Signed-off-by: Chun-Kuang Hu <[email protected]>

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 5b2026f3291d997a1747a8fafb599123eef20ff9..a66728ed6c526911671bf5322c6aa382f10e4bec 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -64,7 +64,7 @@ enum mtk_dpi_out_color_format {
 struct mtk_dpi {
        struct mtk_ddp_comp ddp_comp;
        struct drm_encoder encoder;
 struct mtk_dpi {
        struct mtk_ddp_comp ddp_comp;
        struct drm_encoder encoder;

-       struct drm_bridge *bridge;
+       struct drm_bridge *next_bridge;

        void __iomem *regs;
        struct device *dev;
        struct clk *engine_clk;
        void __iomem *regs;
        struct device *dev;
        struct clk *engine_clk;


@@ -609,7 +609,7 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
 
        dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
 
 
        dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
 

-       ret = drm_bridge_attach(&dpi->encoder, dpi->bridge, NULL, 0);
+       ret = drm_bridge_attach(&dpi->encoder, dpi->next_bridge, NULL, 0);

        if (ret) {
                dev_err(dev, "Failed to attach bridge: %d\n", ret);
                goto err_cleanup;
        if (ret) {
                dev_err(dev, "Failed to attach bridge: %d\n", ret);
                goto err_cleanup;


@@ -769,11 +769,11 @@ static int mtk_dpi_probe(struct platform_device *pdev)
        }
 
        ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
        }
 
        ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,

-                                         NULL, &dpi->bridge);
+                                         NULL, &dpi->next_bridge);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       dev_info(dev, "Found bridge node: %pOF\n", dpi->bridge->of_node);
+       dev_info(dev, "Found bridge node: %pOF\n", dpi->next_bridge->of_node);

 
        comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DPI);
        if (comp_id < 0) {
 
        comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DPI);
        if (comp_id < 0) {