diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-10-01 18:02:13 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 12:46:59 +0200 |
| commit | 5f3fb46bbd643ddacde33fd5fe6f4db4ca963312 (patch) | |
| tree | 95198cf0a8e9b2c22e957dbcb6f4472f88f4e20c /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | 82284b6becdbef6d8cd3fb43e8698510833a5129 (diff) | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index b859f944b53..b5e30b16a9c 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -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,20 +882,18 @@ intel_disable_plane(struct drm_plane *plane) intel_plane->disable_plane(plane, plane->crtc); } - if (!intel_plane->obj) - goto out; - - if (intel_crtc->active) - intel_wait_for_vblank(dev, intel_plane->pipe); + if (intel_plane->obj) { + if (intel_crtc->active) + intel_wait_for_vblank(dev, intel_plane->pipe); - mutex_lock(&dev->struct_mutex); - intel_unpin_fb_obj(intel_plane->obj); - mutex_unlock(&dev->struct_mutex); + mutex_lock(&dev->struct_mutex); + intel_unpin_fb_obj(intel_plane->obj); + mutex_unlock(&dev->struct_mutex); - intel_plane->obj = NULL; -out: + intel_plane->obj = NULL; + } - return ret; + return 0; } static void intel_destroy_plane(struct drm_plane *plane) |