Commit 9db2f6a4 authored by Allen Pais's avatar Allen Pais Committed by Mauro Carvalho Chehab

media: sti: 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 32579c0c
...@@ -77,9 +77,9 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t) ...@@ -77,9 +77,9 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)
add_timer(&fei->timer); add_timer(&fei->timer);
} }
static void channel_swdemux_tsklet(unsigned long data) static void channel_swdemux_tsklet(struct tasklet_struct *t)
{ {
struct channel_info *channel = (struct channel_info *)data; struct channel_info *channel = from_tasklet(channel, t, tsklet);
struct c8sectpfei *fei; struct c8sectpfei *fei;
unsigned long wp, rp; unsigned long wp, rp;
int pos, num_packets, n, size; int pos, num_packets, n, size;
...@@ -208,8 +208,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed) ...@@ -208,8 +208,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed)
dev_dbg(fei->dev, "Starting channel=%p\n", channel); dev_dbg(fei->dev, "Starting channel=%p\n", channel);
tasklet_init(&channel->tsklet, channel_swdemux_tsklet, tasklet_setup(&channel->tsklet, channel_swdemux_tsklet);
(unsigned long) channel);
/* Reset the internal inputblock sram pointers */ /* Reset the internal inputblock sram pointers */
writel(channel->fifo, writel(channel->fifo,
...@@ -638,8 +637,7 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei, ...@@ -638,8 +637,7 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei,
writel(tsin->back_buffer_busaddr, tsin->irec + DMA_PRDS_BUSRP_TP(0)); writel(tsin->back_buffer_busaddr, tsin->irec + DMA_PRDS_BUSRP_TP(0));
/* initialize tasklet */ /* initialize tasklet */
tasklet_init(&tsin->tsklet, channel_swdemux_tsklet, tasklet_setup(&tsin->tsklet, channel_swdemux_tsklet);
(unsigned long) tsin);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment