]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/rockchip: lvds: avoid duplicating drm_bridge_attach
authorPeter Rosin <peda@axentia.se>
Wed, 2 May 2018 07:40:24 +0000 (09:40 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Sun, 20 May 2018 11:44:41 +0000 (13:44 +0200)
drm_bridge_attach takes care of these assignments, so there is no need
to open-code them a second time.

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180502074025.12421-3-peda@axentia.se
drivers/gpu/drm/rockchip/rockchip_lvds.c

index e67f4ea28c0e4122e4a4ce5ae48843e2f9b8a847..4bd94b167d2cdee630483f7773310c55c9b17df9 100644 (file)
@@ -446,14 +446,12 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
                        goto err_free_connector;
                }
        } else {
-               lvds->bridge->encoder = encoder;
                ret = drm_bridge_attach(encoder, lvds->bridge, NULL);
                if (ret) {
                        DRM_DEV_ERROR(drm_dev->dev,
                                      "failed to attach bridge: %d\n", ret);
                        goto err_free_encoder;
                }
-               encoder->bridge = lvds->bridge;
        }
 
        pm_runtime_enable(dev);