From 0ebd63824678ff524ed86aebe4acc450ff05f021 Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Fri, 3 Mar 2017 09:07:20 +0800 Subject: [PATCH] MLK-14314-12 dma: pxp-v3: refine pxp timer init in probe() Extract the timer initialization from pxp_probe() to a seperate function call to make probing process more clear. Signed-off-by: Fancy Fang (cherry picked from commit c8a127e506bca2e38fae02c03ceae4e6956d6ea3) --- drivers/dma/pxp/pxp_dma_v3.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/dma/pxp/pxp_dma_v3.c b/drivers/dma/pxp/pxp_dma_v3.c index 78583cc650b8..289be20c04df 100644 --- a/drivers/dma/pxp/pxp_dma_v3.c +++ b/drivers/dma/pxp/pxp_dma_v3.c @@ -5223,6 +5223,15 @@ static void pxp_remove_attrs(struct platform_device *pdev) device_remove_file(&pdev->dev, &dev_attr_block_size); } +static void pxp_init_timer(struct pxps *pxp) +{ + INIT_WORK(&pxp->work, clkoff_callback); + + init_timer(&pxp->clk_timer); + pxp->clk_timer.function = pxp_clkoff_timer; + pxp->clk_timer.data = (unsigned long)pxp; +} + #ifdef CONFIG_MXC_FPGA_M4_TEST static void pxp_config_m4(struct platform_device *pdev) { @@ -5313,10 +5322,7 @@ static int pxp_probe(struct platform_device *pdev) dump_pxp_reg(pxp); pxp_clk_disable(pxp); - INIT_WORK(&pxp->work, clkoff_callback); - init_timer(&pxp->clk_timer); - pxp->clk_timer.function = pxp_clkoff_timer; - pxp->clk_timer.data = (unsigned long)pxp; + pxp_init_timer(pxp); init_waitqueue_head(&pxp->thread_waitq); /* allocate a kernel thread to dispatch pxp conf */ -- 2.17.1