diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-03-04 05:27:13 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-11 05:56:38 -0400 |
commit | 0647064293d745720fc62e2edc7734fa8af06adf (patch) | |
tree | b8e1092039c7a3a10ef3102b8bf1ee4fc028f75e /drivers/media/platform/marvell-ccic | |
parent | b5b4541eef8eac83f5c0d166d8e494f7c9fff202 (diff) |
[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: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Reviewed-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
-rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 32fab30a9105..8b34c485be79 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c | |||
@@ -1238,7 +1238,7 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb) | |||
1238 | return 0; | 1238 | return 0; |
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb) | 1241 | static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb) |
1242 | { | 1242 | { |
1243 | struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); | 1243 | struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); |
1244 | struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0); | 1244 | 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) | |||
1246 | if (sg_table) | 1246 | if (sg_table) |
1247 | dma_unmap_sg(cam->dev, sg_table->sgl, | 1247 | dma_unmap_sg(cam->dev, sg_table->sgl, |
1248 | sg_table->nents, DMA_FROM_DEVICE); | 1248 | sg_table->nents, DMA_FROM_DEVICE); |
1249 | return 0; | ||
1250 | } | 1249 | } |
1251 | 1250 | ||
1252 | static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb) | 1251 | static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb) |