From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 30 Jul 2014 13:03:57 +0000 (+0200)
Subject: tty: n_gsm, use setup_timer
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c62fd1d9f094b1a97674374d09869df05cdc1025;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

tty: n_gsm, use setup_timer

Just a simple cleanup of init_timer with setting the fields manually.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 81e7ccbd9e4a..d5f578fe3fa6 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2088,9 +2088,7 @@ static int gsm_activate_mux(struct gsm_mux *gsm)
 	struct gsm_dlci *dlci;
 	int i = 0;
 
-	init_timer(&gsm->t2_timer);
-	gsm->t2_timer.function = gsm_control_retransmit;
-	gsm->t2_timer.data = (unsigned long)gsm;
+	setup_timer(&gsm->t2_timer, gsm_control_retransmit, (unsigned long)gsm);
 	init_waitqueue_head(&gsm->event);
 	spin_lock_init(&gsm->control_lock);
 	spin_lock_init(&gsm->tx_lock);