Messages in this thread Patch in this message | | | Date | Tue, 22 Jul 2014 15:06:34 -0700 (PDT) | From | Jakob Bornecrantz <> | Subject | Re: vmwgfx: remove identical branches |
| |
----- Original Message ----- > Commit 8b7de6aa8468: "vmwgfx: Rework fence event action" removed the > tv_sec & tv_usec arguments to vmw_event_fence_action_create, which meant > that both sides of the if/else are now exactly the same. > > Remove the flag check, and just do it unconditionally. > > Spotted with Coverity. > > Signed-off-by: Dave Jones <davej@redhat.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
and thanks for the patch.
Cheers, Jakob.
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > index 436b013b4231..a078e6bbaf0a 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > @@ -1124,16 +1124,10 @@ int vmw_fence_event_ioctl(struct drm_device *dev, > void *data, > > BUG_ON(fence == NULL); > > - if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME) > - ret = vmw_event_fence_action_create(file_priv, fence, > - arg->flags, > - arg->user_data, > - true); > - else > - ret = vmw_event_fence_action_create(file_priv, fence, > - arg->flags, > - arg->user_data, > - true); > + ret = vmw_event_fence_action_create(file_priv, fence, > + arg->flags, > + arg->user_data, > + true); > > if (unlikely(ret != 0)) { > if (ret != -ERESTARTSYS) >
| |