p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

video: fbdev: pxa3xx_gcu: Convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

This also fixes the use of the "priv" variable in QERROR(), since it was
pointing to struct timer_list, not struct pxa3xx_gcu_priv.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Himanshu Jha <himanshujha199640@gmail.com>
[b.zolnierkie: trivial build fixup]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Kees Cook 2017-11-10 16:34:51 +01:00 committed by Bartlomiej Zolnierkiewicz
parent ac831a379d
commit e4a67df75a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/video/fbdev/pxa3xx-gcu.c
View File

@ -512,24 +512,26 @@ pxa3xx_gcu_mmap(struct file *file, struct vm_area_struct *vma)
#ifdef PXA3XX_GCU_DEBUG_TIMER #ifdef PXA3XX_GCU_DEBUG_TIMER
static struct timer_list pxa3xx_gcu_debug_timer; static struct timer_list pxa3xx_gcu_debug_timer;
static struct pxa3xx_gcu_priv *debug_timer_priv;
static void pxa3xx_gcu_debug_timedout(unsigned long ptr) static void pxa3xx_gcu_debug_timedout(struct timer_list *unused)
{ {
struct pxa3xx_gcu_priv *priv = (struct pxa3xx_gcu_priv *) ptr; struct pxa3xx_gcu_priv *priv = debug_timer_priv;
QERROR("Timer DUMP"); QERROR("Timer DUMP");
/* init the timer structure */
setup_timer(&pxa3xx_gcu_debug_timer, pxa3xx_gcu_debug_timedout, ptr);
mod_timer(&pxa3xx_gcu_debug_timer, jiffies + 5 * HZ); mod_timer(&pxa3xx_gcu_debug_timer, jiffies + 5 * HZ);
} }
static void pxa3xx_gcu_init_debug_timer(void) static void pxa3xx_gcu_init_debug_timer(struct pxa3xx_gcu_priv *priv)
{ {
pxa3xx_gcu_debug_timedout((unsigned long) &pxa3xx_gcu_debug_timer); /* init the timer structure */
debug_timer_priv = priv;
timer_setup(&pxa3xx_gcu_debug_timer, pxa3xx_gcu_debug_timedout, 0);
pxa3xx_gcu_debug_timedout(NULL);
} }
#else #else
static inline void pxa3xx_gcu_init_debug_timer(void) {} static inline void pxa3xx_gcu_init_debug_timer(struct pxa3xx_gcu_priv *priv) {}
#endif #endif
static int static int
@ -666,7 +668,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
priv->resource_mem = r; priv->resource_mem = r;
pxa3xx_gcu_reset(priv); pxa3xx_gcu_reset(priv);
pxa3xx_gcu_init_debug_timer(); pxa3xx_gcu_init_debug_timer(priv);
dev_info(dev, "registered @0x%p, DMA 0x%p (%d bytes), IRQ %d\n", dev_info(dev, "registered @0x%p, DMA 0x%p (%d bytes), IRQ %d\n",
(void *) r->start, (void *) priv->shared_phys, (void *) r->start, (void *) priv->shared_phys,