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 <[email protected]> Signed-off-by: Allen Pais <[email protected]> --- drivers/media/platform/pxa_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 6dce33f35041..ae317a900ce6 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -1186,9 +1186,9 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) clk_disable_unprepare(pcdev->clk); } -static void pxa_camera_eof(unsigned long arg) +static void pxa_camera_eof(struct tasklet_struct *t) { - struct pxa_camera_dev *pcdev = (struct pxa_camera_dev *)arg; + struct pxa_camera_dev *pcdev = from_tasklet(pcdev, t, task_eof); unsigned long cifr; struct pxa_buffer *buf; @@ -2478,7 +2478,7 @@ static int pxa_camera_probe(struct platform_device *pdev) goto exit_free_dma; } - tasklet_init(&pcdev->task_eof, pxa_camera_eof, (unsigned long)pcdev); + tasklet_setup(&pcdev->task_eof, pxa_camera_eof); pxa_camera_activate(pcdev); -- 2.17.1
