media: vb2: replace bool by bitfield in vb2_buffer (cfc77408) · Commits · 戴 / test

drivers/media/common/videobuf2/videobuf2-core.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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);

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;