Commit 069e4cdb authored by Allen Pais's avatar Allen Pais Committed by Mauro Carvalho Chehab
Browse files

media: marvell-ccic: convert tasklets to use new tasklet_setup() API 



In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <allen.lkml@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 30fc5a80

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

+3 −4
Original line number Diff line number Diff line
@@ -439,9 +439,9 @@ static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam) 
/*

 * Copy data out to user space in the vmalloc case

 */

static void mcam_frame_tasklet(unsigned long data)

static void mcam_frame_tasklet(struct tasklet_struct *t)

{

	struct mcam_camera *cam = (struct mcam_camera *) data;

	struct mcam_camera *cam = from_tasklet(cam, t, s_tasklet);

	int i;

	unsigned long flags;

	struct mcam_vb_buffer *buf;
@@ -1300,8 +1300,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam) 
		break;

	case B_vmalloc:

#ifdef MCAM_MODE_VMALLOC

		tasklet_init(&cam->s_tasklet, mcam_frame_tasklet,

				(unsigned long) cam);

		tasklet_setup(&cam->s_tasklet, mcam_frame_tasklet);

		vq->ops = &mcam_vb2_ops;

		vq->mem_ops = &vb2_vmalloc_memops;

		cam->dma_setup = mcam_ctlr_dma_vmalloc;