drm/msm: remove msm_drm_private::bridges field

As all output devices have switched to devm_drm_bridge_add(), we can
drop the bridges array from struct msm_drm_private.

Reviewed-by: Rob Clark <[email protected]>
Signed-off-by: Dmitry Baryshkov <[email protected]>
Patchwork: https://patchwork.freedesktop.org/patch/561641/
Signed-off-by: Rob Clark <[email protected]>

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 002c50125f40d4ebcde5422402948a56f9daff6b..7da91f24ae065ac035ae26c8f4a4fcb0d3357eca 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -240,10 +240,6 @@ static int msm_drm_uninit(struct device *dev)
 
        drm_mode_config_cleanup(ddev);
 
-       for (i = 0; i < priv->num_bridges; i++)
-               drm_bridge_remove(priv->bridges[i]);
-       priv->num_bridges = 0;
-
        if (kms) {
                pm_runtime_get_sync(dev);
                msm_irq_uninstall(ddev);

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index ef31e17757c453e21ba72c2d8efa66c4af5f29bc..ceefb560d9f446f5d1a84cbdc8756f63620b9e33 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -206,9 +206,6 @@ struct msm_drm_private {
 
        struct msm_drm_thread event_thread[MAX_CRTCS];
 
-       unsigned int num_bridges;
-       struct drm_bridge *bridges[MAX_BRIDGES];
-
        /* VRAM carveout, used when no IOMMU: */
        struct {
                unsigned long size;