drm/imx: remove drm_mode_connector_detach_encoder harder

Since the last time I've looked more of this stuff sprouted up. Stomp
it down again.

Repeating the original justification for ripping this all out: There's
absolutely no need to deteach connectors before cleaning them up at
driver unload time. And since drm doesn't support hotplugging kms
objects at all it's positively dangerous to attempt this at runtime.
Luckily imx only detachs at driver cleanup time and hence we can
savely remove this.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 62ce0e86f14b50cfe7392bc5b47dd8871616af2b..f996e082faf4d92660885c3923e6b7a25871e928 100644 (file)
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -1883,7 +1883,6 @@ static int imx_hdmi_platform_remove(struct platform_device *pdev)
        struct drm_connector *connector = &hdmi->connector;
        struct drm_encoder *encoder = &hdmi->encoder;
 
-       drm_mode_connector_detach_encoder(connector, encoder);
        imx_drm_remove_connector(hdmi->imx_drm_connector);
        imx_drm_remove_encoder(hdmi->imx_drm_encoder);
 

diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 9abc7ca8b6cf78ad8dba66329352c341a7c369d7..64729fa4a3d431885a9471e7c550520cd2dfb72b 100644 (file)
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -709,8 +709,6 @@ static int imx_tve_remove(struct platform_device *pdev)
        struct drm_connector *connector = &tve->connector;
        struct drm_encoder *encoder = &tve->encoder;
 
-       drm_mode_connector_detach_encoder(connector, encoder);
-
        imx_drm_remove_connector(tve->imx_drm_connector);
        imx_drm_remove_encoder(tve->imx_drm_encoder);