kernel: configure only what is necessary

This prevent confusion while reading the code because, for example, a question: why initialize both timer and tasklet if we can use only one, and we cannot change the configuration at run-time? fd_irq_init: setup_timer only if the user requires timer mode, otherwise initialize tasklet Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

kernel: configure only what is necessary
This prevent confusion while reading the code because, for example, a question: why initialize both timer and tasklet if we can use only one, and we cannot change the configuration at run-time? fd_irq_init: setup_timer only if the user requires timer mode, otherwise initialize tasklet Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
0e8cc1a8 · Federico Vaga · caa875db · 0e8cc1a8
Commit 0e8cc1a8 authored Jun 30, 2014 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

fd-irq.c kernel/fd-irq.c +3 -4

No files found.
--- a/kernel/fd-irq.c
+++ b/kernel/fd-irq.c
@@ -309,21 +309,20 @@ int fd_irq_init(struct fd_dev *fd)
 	if (!fd->sw_fifo.t)
 		return -ENOMEM;

-	fd_timer_period_jiffies = msecs_to_jiffies(fd_timer_period_ms);
 	/*
 	 * According to the period, this can work with a timer (old way)
 	 * or a custom tasklet (newer). Init both anyways, no harm is done.
 	 */
-	setup_timer(&fd->fifo_timer, fd_tlet, (unsigned long)fd);
-	tasklet_init(&fd->tlet, fd_tlet, (unsigned long)fd);
-
 	if (fd_timer_period_ms) {
+		setup_timer(&fd->fifo_timer, fd_tlet, (unsigned long)fd);
+		fd_timer_period_jiffies = msecs_to_jiffies(fd_timer_period_ms);
 		dev_info(&fd->fmc->dev,"Using a timer for input (%i ms)\n",
 			 jiffies_to_msecs(fd_timer_period_jiffies));
 		mod_timer(&fd->fifo_timer, jiffies + fd_timer_period_jiffies);
 	} else {
 		dev_info(fd->fmc->hwdev, "Using interrupts for input\n");

+		tasklet_init(&fd->tlet, fd_tlet, (unsigned long)fd);
 		fmc->irq = fd->fd_regs_base;
 		rv = fmc->op->irq_request(fmc, fd_irq_handler, "fine-delay", 0);