summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/smipcie
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2020-08-17 10:31:46 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-08-29 08:12:06 +0200
commit0852d052e86890622de7ee5863a281c4b27674bf (patch)
treec8789fabd8c4ebcc1a3fe884a4d191657928e97f /drivers/media/pci/smipcie
parent6027ff6ba111f376f9ecfa88f5c081f2e28e1a2f (diff)
downloadlinux-stable-0852d052e86890622de7ee5863a281c4b27674bf.tar.gz
linux-stable-0852d052e86890622de7ee5863a281c4b27674bf.tar.bz2
linux-stable-0852d052e86890622de7ee5863a281c4b27674bf.zip
media: smipcie: 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: Romain Perier <romain.perier@gmail.com> Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/pci/smipcie')
-rw-r--r--drivers/media/pci/smipcie/smipcie-main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c
index 9ca0fc3e6f80..e7604b7ecc8d 100644
--- a/drivers/media/pci/smipcie/smipcie-main.c
+++ b/drivers/media/pci/smipcie/smipcie-main.c
@@ -280,9 +280,9 @@ static void smi_port_clearInterrupt(struct smi_port *port)
}
/* tasklet handler: DMA data to dmx.*/
-static void smi_dma_xfer(unsigned long data)
+static void smi_dma_xfer(struct tasklet_struct *t)
{
- struct smi_port *port = (struct smi_port *) data;
+ struct smi_port *port = from_tasklet(port, t, tasklet);
struct smi_dev *dev = port->dev;
u32 intr_status, finishedData, dmaManagement;
u8 dmaChan0State, dmaChan1State;
@@ -422,7 +422,7 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed)
}
smi_port_disableInterrupt(port);
- tasklet_init(&port->tasklet, smi_dma_xfer, (unsigned long)port);
+ tasklet_setup(&port->tasklet, smi_dma_xfer);
tasklet_disable(&port->tasklet);
port->enable = 1;
return 0;