summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 12:59:40 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-04 14:38:04 +0300
commit4fefcbff8be52c7e68feefa0c96fb8e06923aab3 (patch)
tree714cf8a7456adbb68cb19d42658320a86b61d964 /drivers/tty
parent94be6d74d040c614a332555f5b6d57c26dc272fc (diff)
downloadlinux-4fefcbff8be52c7e68feefa0c96fb8e06923aab3.tar.xz
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/m32r_sio.c1
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)
timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
- up->timer.data = (unsigned long)up;
mod_timer(&up->timer, jiffies + timeout);
} else {
retval = serial_link_irq_chain(up);