From: Kees Cook <keescook@chromium.org>
Date: Tue, 24 Oct 2017 09:59:40 +0000 (-0700)
Subject: serial: m32r_sio: Drop redundant .data assignment
X-Git-Tag: v4.15-rc1~141^2~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4fefcbff8be52c7e68feefa0c96fb8e06923aab3;p=linux.git

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>
---

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);