| Message ID | 20190503163804.31922-1-robert.foss@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/virtio: Remove redundant return type | expand |
On Fri, May 3, 2019 at 9:38 AM Robert Foss <robert.foss@collabora.com> wrote: > > virtio_gpu_fence_emit() always returns 0, since it > has no error paths. > > Consequently no calls for virtio_gpu_fence_emit() > use the return value, and it can be removed. > > Signed-off-by: Robert Foss <robert.foss@collabora.com> > Suggested-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Chia-I Wu <olvaffe@gmail.com> > --- > > This patch was suggested in this email thread: > > [PATCH] drm/virtio: allocate fences with GFP_KERNEL > https://www.spinics.net/lists/dri-devel/msg208536.html > > drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- > drivers/gpu/drm/virtio/virtgpu_fence.c | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index d577cb76f5ad..9bc56887fbdb 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -334,7 +334,7 @@ int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma); > /* virtio_gpu_fence.c */ > struct virtio_gpu_fence *virtio_gpu_fence_alloc( > struct virtio_gpu_device *vgdev); > -int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > +void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > struct virtio_gpu_ctrl_hdr *cmd_hdr, > struct virtio_gpu_fence *fence); > void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, > diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c > index 21bd4c4a32d1..e0744ac768cc 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_fence.c > +++ b/drivers/gpu/drm/virtio/virtgpu_fence.c > @@ -81,7 +81,7 @@ struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev) > return fence; > } > > -int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > +void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > struct virtio_gpu_ctrl_hdr *cmd_hdr, > struct virtio_gpu_fence *fence) > { > @@ -96,7 +96,6 @@ int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > > cmd_hdr->flags |= cpu_to_le32(VIRTIO_GPU_FLAG_FENCE); > cmd_hdr->fence_id = cpu_to_le64(fence->seq); > - return 0; > } > > void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev, > -- > 2.20.1 >
On Fri, May 03, 2019 at 06:38:04PM +0200, Robert Foss wrote: > virtio_gpu_fence_emit() always returns 0, since it > has no error paths. > > Consequently no calls for virtio_gpu_fence_emit() > use the return value, and it can be removed. > > Signed-off-by: Robert Foss <robert.foss@collabora.com> > Suggested-by: Emil Velikov <emil.velikov@collabora.com> Doesn't apply cleanly to drm-misc-next, probably conflicts with one of the other virtio fence patches just pushed. Can you rebase and resend? thanks, Gerd
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index d577cb76f5ad..9bc56887fbdb 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -334,7 +334,7 @@ int virtio_gpu_mmap(struct file *filp, struct vm_area_struct *vma); /* virtio_gpu_fence.c */ struct virtio_gpu_fence *virtio_gpu_fence_alloc( struct virtio_gpu_device *vgdev); -int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, +void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, struct virtio_gpu_ctrl_hdr *cmd_hdr, struct virtio_gpu_fence *fence); void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c index 21bd4c4a32d1..e0744ac768cc 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fence.c +++ b/drivers/gpu/drm/virtio/virtgpu_fence.c @@ -81,7 +81,7 @@ struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev) return fence; } -int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, +void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, struct virtio_gpu_ctrl_hdr *cmd_hdr, struct virtio_gpu_fence *fence) { @@ -96,7 +96,6 @@ int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, cmd_hdr->flags |= cpu_to_le32(VIRTIO_GPU_FLAG_FENCE); cmd_hdr->fence_id = cpu_to_le64(fence->seq); - return 0; } void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev,
virtio_gpu_fence_emit() always returns 0, since it has no error paths. Consequently no calls for virtio_gpu_fence_emit() use the return value, and it can be removed. Signed-off-by: Robert Foss <robert.foss@collabora.com> Suggested-by: Emil Velikov <emil.velikov@collabora.com> --- This patch was suggested in this email thread: [PATCH] drm/virtio: allocate fences with GFP_KERNEL https://www.spinics.net/lists/dri-devel/msg208536.html drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)