| Message ID | 1416309821-5426-7-git-send-email-prabhakar.csengg@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 18 Nov 2014 11:23:35 +0000 "Lad, Prabhakar" <prabhakar.csengg@gmail.com> wrote: > drivers/media/platform/marvell-ccic/mcam-core.c | 29 +++++-------------------- > 1 file changed, 5 insertions(+), 24 deletions(-) So I'm not convinced that this patch improves things; it moves a tiny bit of code into another file where anybody reading the driver will have to go look to see what's going on. But I guess it doesn't really make things worse either; I won't try to stand in its way. It would be nice to see a real changelog on the patch, though. jon -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Jonathan, On Tue, Nov 18, 2014 at 1:03 PM, Jonathan Corbet <corbet@lwn.net> wrote: > On Tue, 18 Nov 2014 11:23:35 +0000 > "Lad, Prabhakar" <prabhakar.csengg@gmail.com> wrote: > >> drivers/media/platform/marvell-ccic/mcam-core.c | 29 +++++-------------------- >> 1 file changed, 5 insertions(+), 24 deletions(-) > > So I'm not convinced that this patch improves things; it moves a tiny bit > of code into another file where anybody reading the driver will have to > go look to see what's going on. But I guess it doesn't really make > things worse either; I won't try to stand in its way. It would be nice > to see a real changelog on the patch, though. > Sorry there is no movement of code to other file. And I dont see any reason why anybody reading will go haywire its a standard v4l2 thing. The subject explains it all, If you still want me to elaborate I can post a v2. Thanks, --Prabhakar Lad -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 18 Nov 2014 13:23:04 +0000 Prabhakar Lad <prabhakar.csengg@gmail.com> wrote: > Sorry there is no movement of code to other file. And I dont see any > reason why anybody reading will go haywire its a standard v4l2 thing. Whatever, I said I wouldn't stand in the way. > The subject explains it all, If you still want me to elaborate I can > post a v2. Here I totally disagree, though. You say what you are doing, not why. What's strange about the idea that a patch should have a reasonable changelog? jon -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index f0eeb6c..eeb87d1 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -1100,26 +1100,6 @@ static void mcam_vb_buf_queue(struct vb2_buffer *vb) mcam_read_setup(cam); } - -/* - * vb2 uses these to release the mutex when waiting in dqbuf. I'm - * not actually sure we need to do this (I'm not sure that vb2_dqbuf() needs - * to be called with the mutex held), but better safe than sorry. - */ -static void mcam_vb_wait_prepare(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_unlock(&cam->s_mutex); -} - -static void mcam_vb_wait_finish(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_lock(&cam->s_mutex); -} - /* * These need to be called with the mutex held from vb2 */ @@ -1189,8 +1169,8 @@ static const struct vb2_ops mcam_vb2_ops = { .buf_queue = mcam_vb_buf_queue, .start_streaming = mcam_vb_start_streaming, .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, }; @@ -1266,8 +1246,8 @@ static const struct vb2_ops mcam_vb2_sg_ops = { .buf_cleanup = mcam_vb_sg_buf_cleanup, .start_streaming = mcam_vb_start_streaming, .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, }; #endif /* MCAM_MODE_DMA_SG */ @@ -1279,6 +1259,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam) memset(vq, 0, sizeof(*vq)); vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vq->drv_priv = cam; + vq->lock = &cam->s_mutex; INIT_LIST_HEAD(&cam->buffers); switch (cam->buffer_mode) { case B_DMA_contig:
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Cc: Jonathan Corbet <corbet@lwn.net> --- drivers/media/platform/marvell-ccic/mcam-core.c | 29 +++++-------------------- 1 file changed, 5 insertions(+), 24 deletions(-)