Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c5027d authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

staging: dgnc: 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.

Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: driverdev-devel@linuxdriverproject.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b28bbb73

drivers/staging/dgnc/dgnc_driver.c

+3 −5
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void dgnc_free_irq(struct dgnc_board *brd) 
  * waiter needs to be woken up, and (b) whether the poller needs to

  * be rescheduled.

  */

static void dgnc_poll_handler(ulong dummy)

static void dgnc_poll_handler(struct timer_list *unused)

{

	struct dgnc_board *brd;

	unsigned long flags;
@@ -323,7 +323,7 @@ static void dgnc_poll_handler(ulong dummy) 
	if ((ulong)new_time >= 2 * dgnc_poll_tick)

		dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);



	setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);

	timer_setup(&dgnc_poll_timer, dgnc_poll_handler, 0);

	dgnc_poll_timer.expires = dgnc_poll_time;

	spin_unlock_irqrestore(&dgnc_poll_lock, flags);
@@ -392,8 +392,6 @@ static int dgnc_start(void) 
	unsigned long flags;

	struct device *dev;



	init_timer(&dgnc_poll_timer);



	rc = register_chrdev(0, "dgnc", &dgnc_board_fops);

	if (rc < 0) {

		pr_err(DRVSTR ": Can't register dgnc driver device (%d)\n", rc);
@@ -419,7 +417,7 @@ static int dgnc_start(void) 


	/* Start the poller */

	spin_lock_irqsave(&dgnc_poll_lock, flags);

	setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);

	timer_setup(&dgnc_poll_timer, dgnc_poll_handler, 0);

	dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);

	dgnc_poll_timer.expires = dgnc_poll_time;

	spin_unlock_irqrestore(&dgnc_poll_lock, flags);