Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f3fb46b authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Kill a goto from sprite disable code 



Let's not use goto when a simple if suffices. This is not error handling
code or anything, so the goto looks out of place.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 82284b6b

drivers/gpu/drm/i915/intel_sprite.c

+9 −12
Original line number Diff line number Diff line
@@ -868,7 +868,6 @@ intel_disable_plane(struct drm_plane *plane) 
	struct drm_device *dev = plane->dev;

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct intel_crtc *intel_crtc;

	int ret = 0;



	if (!plane->fb)

		return 0;
@@ -883,9 +882,7 @@ intel_disable_plane(struct drm_plane *plane) 
		intel_plane->disable_plane(plane, plane->crtc);

	}



	if (!intel_plane->obj)

		goto out;



	if (intel_plane->obj) {

		if (intel_crtc->active)

			intel_wait_for_vblank(dev, intel_plane->pipe);
@@ -894,9 +891,9 @@ intel_disable_plane(struct drm_plane *plane) 
		mutex_unlock(&dev->struct_mutex);



		intel_plane->obj = NULL;

out:

	}



	return ret;

	return 0;

}



static void intel_destroy_plane(struct drm_plane *plane)