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>

diff --git a/drivers/media/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c
index 9ca0fc3e6f80cf8ffac5a28e7223e84f808a1240..e7604b7ecc8d17cb08450cddfd61ceb39bca0bb1 100644 (file)
--- 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;