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

Commit 06470642 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: change result code of buf_finish to void 



The buf_finish op should always work, so change the return type to void.
Update the few drivers that use it.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Reviewed-by: default avatarPawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b5b4541e

drivers/media/parport/bw-qcam.c

+1 −2
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static void buffer_queue(struct vb2_buffer *vb) 
	vb2_buffer_done(vb, VB2_BUF_STATE_DONE);

}



static int buffer_finish(struct vb2_buffer *vb)

static void buffer_finish(struct vb2_buffer *vb)

{

	struct qcam *qcam = vb2_get_drv_priv(vb->vb2_queue);

	void *vbuf = vb2_plane_vaddr(vb, 0);
@@ -691,7 +691,6 @@ static int buffer_finish(struct vb2_buffer *vb) 
	if (len != size)

		vb->state = VB2_BUF_STATE_ERROR;

	vb2_set_plane_payload(vb, 0, len);

	return 0;

}



static struct vb2_ops qcam_video_qops = {

drivers/media/pci/sta2x11/sta2x11_vip.c

+1 −3
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static void buffer_queue(struct vb2_buffer *vb) 
	}

	spin_unlock(&vip->lock);

}

static int buffer_finish(struct vb2_buffer *vb)

static void buffer_finish(struct vb2_buffer *vb)

{

	struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);

	struct vip_buffer *vip_buf = to_vip_buffer(vb);
@@ -338,8 +338,6 @@ static int buffer_finish(struct vb2_buffer *vb) 
	spin_unlock(&vip->lock);



	vip_active_buf_next(vip);



	return 0;

}



static int start_streaming(struct vb2_queue *vq, unsigned int count)

drivers/media/platform/marvell-ccic/mcam-core.c

+1 −2
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb) 
	return 0;

}



static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)

static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb)

{

	struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);

	struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
@@ -1246,7 +1246,6 @@ static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb) 
	if (sg_table)

		dma_unmap_sg(cam->dev, sg_table->sgl,

				sg_table->nents, DMA_FROM_DEVICE);

	return 0;

}



static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)

drivers/media/usb/pwc/pwc-if.c

+2 −2
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static int buffer_prepare(struct vb2_buffer *vb) 
	return 0;

}



static int buffer_finish(struct vb2_buffer *vb)

static void buffer_finish(struct vb2_buffer *vb)

{

	struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);

	struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
@@ -624,7 +624,7 @@ static int buffer_finish(struct vb2_buffer *vb) 
	 * filled, take the pwc data we've stored in buf->data and decompress

	 * it into a usable format, storing the result in the vb2_buffer

	 */

	return pwc_decompress(pdev, buf);

	pwc_decompress(pdev, buf);

}



static void buffer_cleanup(struct vb2_buffer *vb)

drivers/media/usb/uvc/uvc_queue.c

+1 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb) 
	spin_unlock_irqrestore(&queue->irqlock, flags);

}



static int uvc_buffer_finish(struct vb2_buffer *vb)

static void uvc_buffer_finish(struct vb2_buffer *vb)

{

	struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);

	struct uvc_streaming *stream =
@@ -114,7 +114,6 @@ static int uvc_buffer_finish(struct vb2_buffer *vb) 
	struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);



	uvc_video_clock_update(stream, &vb->v4l2_buf, buf);

	return 0;

}



static void uvc_wait_prepare(struct vb2_queue *vq)