diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2014-07-30 15:03:57 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 16:04:21 -0700 |
| commit | c62fd1d9f094b1a97674374d09869df05cdc1025 (patch) | |
| tree | 2246001deeed14cc93549686fb370e9da778cc57 /drivers/tty/n_gsm.c | |
| parent | Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console" (diff) | |
| download | linux-dev-c62fd1d9f094b1a97674374d09869df05cdc1025.tar.xz linux-dev-c62fd1d9f094b1a97674374d09869df05cdc1025.zip | |
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>
Diffstat (limited to 'drivers/tty/n_gsm.c')
| -rw-r--r-- | drivers/tty/n_gsm.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |