From 58aca7485a4cd9fcccc6e4044325048abcc2f9c7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 4 Jun 2008 13:03:23 +1000 Subject: drm: remove sysfs in driver for now.. should probably be in helper --- linux-core/drm_crtc.c | 3 --- linux-core/intel_crt.c | 1 + linux-core/intel_dvo.c | 1 + linux-core/intel_lvds.c | 1 + linux-core/intel_sdvo.c | 2 +- linux-core/intel_tv.c | 1 + 6 files changed, 5 insertions(+), 4 deletions(-) (limited to 'linux-core') diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c index 4f2297a2..73ad317a 100644 --- 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 bf7c449e..e32a9551 100644 --- 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 b061b1c5..e6df8fdd 100644 --- 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 f2fe4612..cf9294ee 100644 --- 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 9ae0d567..ef67ef9b 100644 --- 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 e45cfa3b..25fb2e6b 100644 --- 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); -- cgit v1.2.3