Merge tag 'xtensa-20180129' of git://github.com/jcmvbkbc/linux-xtensa

[linux-2.6-block.git] / arch / xtensa / platforms / iss / console.c

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 6fc0a946ad6450f1dd42ebf97101dedc43cc92b9..92f567f9a21e0f7cd0af98c8052efb17ad5dbd6c 100644 (file)
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -47,15 +47,14 @@ static char *serial_name = "ISS serial driver";
  * initialization for the tty structure.
  */
 
-static void rs_poll(unsigned long);
+static void rs_poll(struct timer_list *);
 
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
        tty->port = &serial_port;
        spin_lock_bh(&timer_lock);
        if (tty->count == 1) {
-               setup_timer(&serial_timer, rs_poll,
-                               (unsigned long)&serial_port);
+               timer_setup(&serial_timer, rs_poll, 0);
                mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
        }
        spin_unlock_bh(&timer_lock);
@@ -92,9 +91,9 @@ static int rs_write(struct tty_struct * tty,
        return count;
 }
 
-static void rs_poll(unsigned long priv)
+static void rs_poll(struct timer_list *unused)
 {
-       struct tty_port *port = (struct tty_port *)priv;
+       struct tty_port *port = &serial_port;
        int i = 0;
        int rd = 1;
        unsigned char c;