diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 20375cc7f82d..9350edd6728d 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -2433,7 +2433,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, | |||
2433 | connector->base.unregister = intel_sdvo_connector_unregister; | 2433 | connector->base.unregister = intel_sdvo_connector_unregister; |
2434 | 2434 | ||
2435 | intel_connector_attach_encoder(&connector->base, &encoder->base); | 2435 | intel_connector_attach_encoder(&connector->base, &encoder->base); |
2436 | ret = drm_sysfs_connector_add(drm_connector); | 2436 | ret = drm_connector_register(drm_connector); |
2437 | if (ret < 0) | 2437 | if (ret < 0) |
2438 | goto err1; | 2438 | goto err1; |
2439 | 2439 | ||
@@ -2446,7 +2446,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, | |||
2446 | return 0; | 2446 | return 0; |
2447 | 2447 | ||
2448 | err2: | 2448 | err2: |
2449 | drm_sysfs_connector_remove(drm_connector); | 2449 | drm_connector_unregister(drm_connector); |
2450 | err1: | 2450 | err1: |
2451 | drm_connector_cleanup(drm_connector); | 2451 | drm_connector_cleanup(drm_connector); |
2452 | 2452 | ||
@@ -2559,7 +2559,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) | |||
2559 | return true; | 2559 | return true; |
2560 | 2560 | ||
2561 | err: | 2561 | err: |
2562 | drm_sysfs_connector_remove(connector); | 2562 | drm_connector_unregister(connector); |
2563 | intel_sdvo_destroy(connector); | 2563 | intel_sdvo_destroy(connector); |
2564 | return false; | 2564 | return false; |
2565 | } | 2565 | } |
@@ -2638,7 +2638,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) | |||
2638 | return true; | 2638 | return true; |
2639 | 2639 | ||
2640 | err: | 2640 | err: |
2641 | drm_sysfs_connector_remove(connector); | 2641 | drm_connector_unregister(connector); |
2642 | intel_sdvo_destroy(connector); | 2642 | intel_sdvo_destroy(connector); |
2643 | return false; | 2643 | return false; |
2644 | } | 2644 | } |
@@ -2711,7 +2711,7 @@ static void intel_sdvo_output_cleanup(struct intel_sdvo *intel_sdvo) | |||
2711 | list_for_each_entry_safe(connector, tmp, | 2711 | list_for_each_entry_safe(connector, tmp, |
2712 | &dev->mode_config.connector_list, head) { | 2712 | &dev->mode_config.connector_list, head) { |
2713 | if (intel_attached_encoder(connector) == &intel_sdvo->base) { | 2713 | if (intel_attached_encoder(connector) == &intel_sdvo->base) { |
2714 | drm_sysfs_connector_remove(connector); | 2714 | drm_connector_unregister(connector); |
2715 | intel_sdvo_destroy(connector); | 2715 | intel_sdvo_destroy(connector); |
2716 | } | 2716 | } |
2717 | } | 2717 | } |