[PATCH 6/9] soc-camera: Don't check vb2_queue_init() return value

[Ezequiel Garcia]

Right now vb2_queue_init() returns always 0
and it will be changed to return void.

Cc: Josh Wu <josh...@atmel.com>
Cc: Javier Martin <javier.mar...@vista-silicon.com>
Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
Cc: Magnus Damm <magnus.d...@gmail.com>
Signed-off-by: Ezequiel Garcia <elezegar...@gmail.com>
---
 drivers/media/platform/soc_camera/atmel-isi.c      |    3 ++-
 drivers/media/platform/soc_camera/mx2_camera.c     |    3 ++-
 drivers/media/platform/soc_camera/mx3_camera.c     |    3 ++-
 .../platform/soc_camera/sh_mobile_ceu_camera.c     |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c 
b/drivers/media/platform/soc_camera/atmel-isi.c
index 6274a91..0fe61d6 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -515,7 +515,8 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
        q->ops = &isi_video_qops;
        q->mem_ops = &vb2_dma_contig_memops;
 
-       return vb2_queue_init(q);
+       vb2_queue_init(q);
+       return 0;
 }
 
 static int isi_camera_set_fmt(struct soc_camera_device *icd,
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c 
b/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f..0fc7714 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -981,7 +981,8 @@ static int mx2_camera_init_videobuf(struct vb2_queue *q,
        q->mem_ops = &vb2_dma_contig_memops;
        q->buf_struct_size = sizeof(struct mx2_buffer);
 
-       return vb2_queue_init(q);
+       vb2_queue_init(q);
+       return 0;
 }
 
 #define MX2_BUS_FLAGS  (V4L2_MBUS_MASTER | \
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c 
b/drivers/media/platform/soc_camera/mx3_camera.c
index 16975c6..7e9ea36 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -456,7 +456,8 @@ static int mx3_camera_init_videobuf(struct vb2_queue *q,
        q->mem_ops = &vb2_dma_contig_memops;
        q->buf_struct_size = sizeof(struct mx3_camera_buffer);
 
-       return vb2_queue_init(q);
+       vb2_queue_init(q);
+       return 0;
 }
 
 /* First part of ipu_csi_init_interface() */
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c 
b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 0baaf94..ff32659 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -2026,7 +2026,8 @@ static int sh_mobile_ceu_init_videobuf(struct vb2_queue 
*q,
        q->mem_ops = &vb2_dma_contig_memops;
        q->buf_struct_size = sizeof(struct sh_mobile_ceu_buffer);
 
-       return vb2_queue_init(q);
+       vb2_queue_init(q);
+       return 0;
 }
 
 static struct soc_camera_host_ops sh_mobile_ceu_host_ops = {
-- 
1.7.8.6

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html