| Message ID | 20190204101134.56283-2-hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve vb2_find_buffer | expand |
Hi, On Mon, 2019-02-04 at 11:11 +0100, hverkuil-cisco@xs4all.nl wrote: > From: Hans Verkuil <hverkuil-cisco@xs4all.nl> > > The bool type is not recommended for use in structs, so replace these > by bitfields. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Cheers, Paul > --- > drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++------ > include/media/videobuf2-core.h | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index e07b6bdb6982..35cf36686e20 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -934,7 +934,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) > /* sync buffers */ > for (plane = 0; plane < vb->num_planes; ++plane) > call_void_memop(vb, finish, vb->planes[plane].mem_priv); > - vb->synced = false; > + vb->synced = 0; > } > > spin_lock_irqsave(&q->done_lock, flags); > @@ -1313,8 +1313,8 @@ static int __buf_prepare(struct vb2_buffer *vb) > for (plane = 0; plane < vb->num_planes; ++plane) > call_void_memop(vb, prepare, vb->planes[plane].mem_priv); > > - vb->synced = true; > - vb->prepared = true; > + vb->synced = 1; > + vb->prepared = 1; > vb->state = orig_state; > > return 0; > @@ -1803,7 +1803,7 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb, > } > > call_void_vb_qop(vb, buf_finish, vb); > - vb->prepared = false; > + vb->prepared = 0; > > if (pindex) > *pindex = vb->index; > @@ -1927,12 +1927,12 @@ static void __vb2_queue_cancel(struct vb2_queue *q) > for (plane = 0; plane < vb->num_planes; ++plane) > call_void_memop(vb, finish, > vb->planes[plane].mem_priv); > - vb->synced = false; > + vb->synced = 0; > } > > if (vb->prepared) { > call_void_vb_qop(vb, buf_finish, vb); > - vb->prepared = false; > + vb->prepared = 0; > } > __vb2_dqbuf(vb); > > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > index 4849b865b908..2757d1902609 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -269,8 +269,8 @@ struct vb2_buffer { > * vb2_plane: per-plane information; do not change > */ > enum vb2_buffer_state state; > - bool synced; > - bool prepared; > + unsigned int synced:1; > + unsigned int prepared:1; > > struct vb2_plane planes[VB2_MAX_PLANES]; > struct list_head queued_entry;
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index e07b6bdb6982..35cf36686e20 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -934,7 +934,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) /* sync buffers */ for (plane = 0; plane < vb->num_planes; ++plane) call_void_memop(vb, finish, vb->planes[plane].mem_priv); - vb->synced = false; + vb->synced = 0; } spin_lock_irqsave(&q->done_lock, flags); @@ -1313,8 +1313,8 @@ static int __buf_prepare(struct vb2_buffer *vb) for (plane = 0; plane < vb->num_planes; ++plane) call_void_memop(vb, prepare, vb->planes[plane].mem_priv); - vb->synced = true; - vb->prepared = true; + vb->synced = 1; + vb->prepared = 1; vb->state = orig_state; return 0; @@ -1803,7 +1803,7 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb, } call_void_vb_qop(vb, buf_finish, vb); - vb->prepared = false; + vb->prepared = 0; if (pindex) *pindex = vb->index; @@ -1927,12 +1927,12 @@ static void __vb2_queue_cancel(struct vb2_queue *q) for (plane = 0; plane < vb->num_planes; ++plane) call_void_memop(vb, finish, vb->planes[plane].mem_priv); - vb->synced = false; + vb->synced = 0; } if (vb->prepared) { call_void_vb_qop(vb, buf_finish, vb); - vb->prepared = false; + vb->prepared = 0; } __vb2_dqbuf(vb); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 4849b865b908..2757d1902609 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -269,8 +269,8 @@ struct vb2_buffer { * vb2_plane: per-plane information; do not change */ enum vb2_buffer_state state; - bool synced; - bool prepared; + unsigned int synced:1; + unsigned int prepared:1; struct vb2_plane planes[VB2_MAX_PLANES]; struct list_head queued_entry;