drm: remove sysfs in driver for now.. should probably be in helper

diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 4f2297a..73ad317 100644 (file)
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -643,7 +643,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
        }
 
        list_for_each_entry_safe(connector, ot, &dev->mode_config.connector_list, head) {
-               drm_sysfs_connector_remove(connector);
                connector->funcs->destroy(connector);
        }
 
@@ -662,8 +661,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
 }
 EXPORT_SYMBOL(drm_mode_config_cleanup);
 
-
-
 int drm_mode_hotplug_ioctl(struct drm_device *dev,
                           void *data, struct drm_file *file_priv)
 {

diff --git a/linux-core/intel_crt.c b/linux-core/intel_crt.c
index bf7c449..e32a955 100644 (file)
--- a/linux-core/intel_crt.c
+++ b/linux-core/intel_crt.c
@@ -199,6 +199,7 @@ static void intel_crt_destroy(struct drm_connector *connector)
        struct intel_output *intel_output = to_intel_output(connector);
 
        intel_i2c_destroy(intel_output->ddc_bus);
+       drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        kfree(connector);
 }

diff --git a/linux-core/intel_dvo.c b/linux-core/intel_dvo.c
index b061b1c..e6df8fd 100644 (file)
--- a/linux-core/intel_dvo.c
+++ b/linux-core/intel_dvo.c
@@ -306,6 +306,7 @@ static void intel_dvo_destroy (struct drm_connector *connector)
                intel_i2c_destroy(intel_output->i2c_bus);
        if (intel_output->ddc_bus)
                intel_i2c_destroy(intel_output->ddc_bus);
+       drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        kfree(intel_output);
 }

diff --git a/linux-core/intel_lvds.c b/linux-core/intel_lvds.c
index f2fe461..cf9294e 100644 (file)
--- a/linux-core/intel_lvds.c
+++ b/linux-core/intel_lvds.c
@@ -330,6 +330,7 @@ static void intel_lvds_destroy(struct drm_connector *connector)
        struct intel_output *intel_output = to_intel_output(connector);
 
        intel_i2c_destroy(intel_output->ddc_bus);
+       drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        kfree(connector);
 }

diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 9ae0d56..ef67ef9 100644 (file)
--- a/linux-core/intel_sdvo.c
+++ b/linux-core/intel_sdvo.c
@@ -966,7 +966,7 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
 
        if (intel_output->i2c_bus)
                intel_i2c_destroy(intel_output->i2c_bus);
-
+       drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        kfree(intel_output);
 }

diff --git a/linux-core/intel_tv.c b/linux-core/intel_tv.c
index e45cfa3..25fb2e6 100644 (file)
--- a/linux-core/intel_tv.c
+++ b/linux-core/intel_tv.c
@@ -1553,6 +1553,7 @@ intel_tv_destroy (struct drm_connector *connector)
 {
        struct intel_output *intel_output = to_intel_output(connector);
 
+       drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        drm_free(intel_output, sizeof(struct intel_output) + sizeof(struct intel_tv_priv),
                 DRM_MEM_DRIVER);