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 6a4d5bc17697..e0be8ae75c15 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -2431,7 +2431,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, | |||
2431 | connector->base.unregister = intel_sdvo_connector_unregister; | 2431 | connector->base.unregister = intel_sdvo_connector_unregister; |
2432 | 2432 | ||
2433 | intel_connector_attach_encoder(&connector->base, &encoder->base); | 2433 | intel_connector_attach_encoder(&connector->base, &encoder->base); |
2434 | ret = drm_sysfs_connector_add(drm_connector); | 2434 | ret = drm_connector_register(drm_connector); |
2435 | if (ret < 0) | 2435 | if (ret < 0) |
2436 | goto err1; | 2436 | goto err1; |
2437 | 2437 | ||
@@ -2444,7 +2444,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, | |||
2444 | return 0; | 2444 | return 0; |
2445 | 2445 | ||
2446 | err2: | 2446 | err2: |
2447 | drm_sysfs_connector_remove(drm_connector); | 2447 | drm_connector_unregister(drm_connector); |
2448 | err1: | 2448 | err1: |
2449 | drm_connector_cleanup(drm_connector); | 2449 | drm_connector_cleanup(drm_connector); |
2450 | 2450 | ||
@@ -2557,7 +2557,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) | |||
2557 | return true; | 2557 | return true; |
2558 | 2558 | ||
2559 | err: | 2559 | err: |
2560 | drm_sysfs_connector_remove(connector); | 2560 | drm_connector_unregister(connector); |
2561 | intel_sdvo_destroy(connector); | 2561 | intel_sdvo_destroy(connector); |
2562 | return false; | 2562 | return false; |
2563 | } | 2563 | } |
@@ -2636,7 +2636,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) | |||
2636 | return true; | 2636 | return true; |
2637 | 2637 | ||
2638 | err: | 2638 | err: |
2639 | drm_sysfs_connector_remove(connector); | 2639 | drm_connector_unregister(connector); |
2640 | intel_sdvo_destroy(connector); | 2640 | intel_sdvo_destroy(connector); |
2641 | return false; | 2641 | return false; |
2642 | } | 2642 | } |
@@ -2709,7 +2709,7 @@ static void intel_sdvo_output_cleanup(struct intel_sdvo *intel_sdvo) | |||
2709 | list_for_each_entry_safe(connector, tmp, | 2709 | list_for_each_entry_safe(connector, tmp, |
2710 | &dev->mode_config.connector_list, head) { | 2710 | &dev->mode_config.connector_list, head) { |
2711 | if (intel_attached_encoder(connector) == &intel_sdvo->base) { | 2711 | if (intel_attached_encoder(connector) == &intel_sdvo->base) { |
2712 | drm_sysfs_connector_remove(connector); | 2712 | drm_connector_unregister(connector); |
2713 | intel_sdvo_destroy(connector); | 2713 | intel_sdvo_destroy(connector); |
2714 | } | 2714 | } |
2715 | } | 2715 | } |