Commit 4cf709c9 authored by Allen Pais's avatar Allen Pais Committed by Mauro Carvalho Chehab

media: mantis: 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 143ca1d0
...@@ -200,9 +200,9 @@ void mantis_dma_stop(struct mantis_pci *mantis) ...@@ -200,9 +200,9 @@ void mantis_dma_stop(struct mantis_pci *mantis)
} }
void mantis_dma_xfer(unsigned long data) void mantis_dma_xfer(struct tasklet_struct *t)
{ {
struct mantis_pci *mantis = (struct mantis_pci *) data; struct mantis_pci *mantis = from_tasklet(mantis, t, tasklet);
struct mantis_hwconfig *config = mantis->hwconfig; struct mantis_hwconfig *config = mantis->hwconfig;
while (mantis->last_block != mantis->busy_block) { while (mantis->last_block != mantis->busy_block) {
......
...@@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis); ...@@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis);
extern int mantis_dma_exit(struct mantis_pci *mantis); extern int mantis_dma_exit(struct mantis_pci *mantis);
extern void mantis_dma_start(struct mantis_pci *mantis); extern void mantis_dma_start(struct mantis_pci *mantis);
extern void mantis_dma_stop(struct mantis_pci *mantis); extern void mantis_dma_stop(struct mantis_pci *mantis);
extern void mantis_dma_xfer(unsigned long data); extern void mantis_dma_xfer(struct tasklet_struct *t);
#endif /* __MANTIS_DMA_H */ #endif /* __MANTIS_DMA_H */
...@@ -205,7 +205,7 @@ int mantis_dvb_init(struct mantis_pci *mantis) ...@@ -205,7 +205,7 @@ int mantis_dvb_init(struct mantis_pci *mantis)
} }
dvb_net_init(&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); dvb_net_init(&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx);
tasklet_init(&mantis->tasklet, mantis_dma_xfer, (unsigned long) mantis); tasklet_setup(&mantis->tasklet, mantis_dma_xfer);
tasklet_disable(&mantis->tasklet); tasklet_disable(&mantis->tasklet);
if (mantis->hwconfig) { if (mantis->hwconfig) {
result = config->frontend_init(mantis, mantis->fe); result = config->frontend_init(mantis, mantis->fe);
......
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