Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/virtio: make virtio_gpu_object_attach void

It always returns zero.

Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200401223039.2860-4-gurchetansingh@chromium.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

authored by

Gurchetan Singh and committed by
Gerd Hoffmann
c76d4ab7 6457a0df

+9 -14
+4 -4
drivers/gpu/drm/virtio/virtgpu_drv.h
··· 279 279 uint32_t scanout_id, uint32_t resource_id, 280 280 uint32_t width, uint32_t height, 281 281 uint32_t x, uint32_t y); 282 - int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, 283 - struct virtio_gpu_object *obj, 284 - struct virtio_gpu_mem_entry *ents, 285 - unsigned int nents); 282 + void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, 283 + struct virtio_gpu_object *obj, 284 + struct virtio_gpu_mem_entry *ents, 285 + unsigned int nents); 286 286 int virtio_gpu_attach_status_page(struct virtio_gpu_device *vgdev); 287 287 int virtio_gpu_detach_status_page(struct virtio_gpu_device *vgdev); 288 288 void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev,
+1 -5
drivers/gpu/drm/virtio/virtgpu_object.c
··· 235 235 return ret; 236 236 } 237 237 238 - ret = virtio_gpu_object_attach(vgdev, bo, ents, nents); 239 - if (ret != 0) { 240 - virtio_gpu_free_object(&shmem_obj->base); 241 - return ret; 242 - } 238 + virtio_gpu_object_attach(vgdev, bo, ents, nents); 243 239 244 240 *bo_ptr = bo; 245 241 return 0;
+4 -5
drivers/gpu/drm/virtio/virtgpu_vq.c
··· 1087 1087 virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence); 1088 1088 } 1089 1089 1090 - int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, 1091 - struct virtio_gpu_object *obj, 1092 - struct virtio_gpu_mem_entry *ents, 1093 - unsigned int nents) 1090 + void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev, 1091 + struct virtio_gpu_object *obj, 1092 + struct virtio_gpu_mem_entry *ents, 1093 + unsigned int nents) 1094 1094 { 1095 1095 virtio_gpu_cmd_resource_attach_backing(vgdev, obj->hw_res_handle, 1096 1096 ents, nents, NULL); 1097 - return 0; 1098 1097 } 1099 1098 1100 1099 void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev,