Эх сурвалжийг харах

drm/amd/display: Remove unnecessary fail labels in create_stream_for_sink

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Harry Wentland 7 жил өмнө
parent
commit
64245fa72d

+ 5 - 9
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

@@ -2384,12 +2384,12 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 
 
 	if (aconnector == NULL) {
 	if (aconnector == NULL) {
 		DRM_ERROR("aconnector is NULL!\n");
 		DRM_ERROR("aconnector is NULL!\n");
-		goto drm_connector_null;
+		return stream;
 	}
 	}
 
 
 	if (dm_state == NULL) {
 	if (dm_state == NULL) {
 		DRM_ERROR("dm_state is NULL!\n");
 		DRM_ERROR("dm_state is NULL!\n");
-		goto dm_state_null;
+		return stream;
 	}
 	}
 
 
 	drm_connector = &aconnector->base;
 	drm_connector = &aconnector->base;
@@ -2401,18 +2401,18 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 		 */
 		 */
 		if (aconnector->mst_port) {
 		if (aconnector->mst_port) {
 			dm_dp_mst_dc_sink_create(drm_connector);
 			dm_dp_mst_dc_sink_create(drm_connector);
-			goto mst_dc_sink_create_done;
+			return stream;
 		}
 		}
 
 
 		if (create_fake_sink(aconnector))
 		if (create_fake_sink(aconnector))
-			goto stream_create_fail;
+			return stream;
 	}
 	}
 
 
 	stream = dc_create_stream_for_sink(aconnector->dc_sink);
 	stream = dc_create_stream_for_sink(aconnector->dc_sink);
 
 
 	if (stream == NULL) {
 	if (stream == NULL) {
 		DRM_ERROR("Failed to create stream for sink!\n");
 		DRM_ERROR("Failed to create stream for sink!\n");
-		goto stream_create_fail;
+		return stream;
 	}
 	}
 
 
 	list_for_each_entry(preferred_mode, &aconnector->base.modes, head) {
 	list_for_each_entry(preferred_mode, &aconnector->base.modes, head) {
@@ -2450,10 +2450,6 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 		drm_connector,
 		drm_connector,
 		aconnector->dc_sink);
 		aconnector->dc_sink);
 
 
-stream_create_fail:
-dm_state_null:
-drm_connector_null:
-mst_dc_sink_create_done:
 	return stream;
 	return stream;
 }
 }