media: vb2: replace bool by bitfield in vb2_buffer

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 34cc87ca8d5986da520045f3628e02bced89d604..b4457edc3245bf5310840a9ed6297b1563681db0 100644 (file)
--- 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;
@@ -1802,7 +1802,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;
@@ -1926,12 +1926,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 06142c1469cc4d95b84fed191544ffa110f82192..6d5490bb91d3af5c87c88863922e3fb3bc516a98 100644 (file)
--- 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;