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

Commit b973154a authored by Jan Koniarik's avatar Jan Koniarik Committed by David S. Miller
Browse files

atm: idt77252, use setup_timer and mod_timer 



Stop accessing timer struct members directly and use setup_timer and
mod_timer helpers intended for that use. It makes the code cleaner and
will allow for easier change of the timer struct internals.

Signed-off-by: default avatarJan Koniarik <jan.koniarik@trustica.cz>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Chas Williams <3chas3@gmail.com>
Cc: <linux-atm-general@lists.sourceforge.net>
Cc: <netdev@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c921a89

drivers/atm/idt77252.c

+3 −9
Original line number Diff line number Diff line
@@ -2132,12 +2132,8 @@ idt77252_init_est(struct vc_map *vc, int pcr) 


	est->interval = 2;		/* XXX: make this configurable */

	est->ewma_log = 2;		/* XXX: make this configurable */

	init_timer(&est->timer);

	est->timer.data = (unsigned long)vc;

	est->timer.function = idt77252_est_timer;



	est->timer.expires = jiffies + ((HZ / 4) << est->interval);

	add_timer(&est->timer);

	setup_timer(&est->timer, idt77252_est_timer, (unsigned long)vc);

	mod_timer(&est->timer, jiffies + ((HZ / 4) << est->interval));



	return est;

}
@@ -3638,9 +3634,7 @@ static int idt77252_init_one(struct pci_dev *pcidev, 
	spin_lock_init(&card->cmd_lock);

	spin_lock_init(&card->tst_lock);



	init_timer(&card->tst_timer);

	card->tst_timer.data = (unsigned long)card;

	card->tst_timer.function = tst_timer;

	setup_timer(&card->tst_timer, tst_timer, (unsigned long)card);



	/* Do the I/O remapping... */

	card->membase = ioremap(membase, 1024);