Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3953fb authored by Libin Yang's avatar Libin Yang Committed by Mauro Carvalho Chehab
Browse files

[media] marvell-ccic: refine mcam_set_contig_buffer function 



This patch refines mcam_set_contig_buffer() in mcam core.
It can remove redundant code line and enhance readability.

Signed-off-by: default avatarAlbert Wang <twang13@marvell.com>
Signed-off-by: default avatarLibin Yang <lbyang@marvell.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 7c269f45

drivers/media/platform/marvell-ccic/mcam-core.c

+10 −11
Original line number Diff line number Diff line
@@ -481,22 +481,21 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame) 
	 */

	if (list_empty(&cam->buffers)) {

		buf = cam->vb_bufs[frame ^ 0x1];

		cam->vb_bufs[frame] = buf;

		mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR,

				vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0));

		set_bit(CF_SINGLE_BUFFER, &cam->flags);

		cam->frame_state.singles++;

		return;

	}

	} else {

		/*

		 * OK, we have a buffer we can use.

		 */

	buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue);

		buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer,

					queue);

		list_del_init(&buf->queue);

		clear_bit(CF_SINGLE_BUFFER, &cam->flags);

	}



	cam->vb_bufs[frame] = buf;

	mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR,

			vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0));

	cam->vb_bufs[frame] = buf;

	clear_bit(CF_SINGLE_BUFFER, &cam->flags);

}



/*