diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-24 05:59:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-04 07:38:04 -0400 |
commit | 4fefcbff8be52c7e68feefa0c96fb8e06923aab3 (patch) | |
tree | 714cf8a7456adbb68cb19d42658320a86b61d964 | |
parent | 94be6d74d040c614a332555f5b6d57c26dc272fc (diff) |
serial: m32r_sio: Drop redundant .data assignment
With the timer converted to using the new timer_setup()/from_timer() API,
setting the .data field is redundant (and the field will be removed soon),
so drop it.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/m32r_sio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c index 5f4003ad32b6..0bc548adae52 100644 --- a/drivers/tty/serial/m32r_sio.c +++ b/drivers/tty/serial/m32r_sio.c | |||
@@ -576,7 +576,6 @@ static int m32r_sio_startup(struct uart_port *port) | |||
576 | 576 | ||
577 | timeout = timeout > 6 ? (timeout / 2 - 2) : 1; | 577 | timeout = timeout > 6 ? (timeout / 2 - 2) : 1; |
578 | 578 | ||
579 | up->timer.data = (unsigned long)up; | ||
580 | mod_timer(&up->timer, jiffies + timeout); | 579 | mod_timer(&up->timer, jiffies + timeout); |
581 | } else { | 580 | } else { |
582 | retval = serial_link_irq_chain(up); | 581 | retval = serial_link_irq_chain(up); |