1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index be3e3c1206c2..fd2146bcc0ad 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -69,7 +69,7 @@ static struct con3270 *condev;
 #define CON_UPDATE_STATUS       4       /* Update status line. */
 #define CON_UPDATE_ALL          8       /* Recreate screen. */
 
-static void con3270_update(struct con3270 *);
+static void con3270_update(struct timer_list *);
 
 /*
  * Setup timeout for a device. On timeout trigger an update.
@@ -205,8 +205,9 @@ con3270_write_callback(struct raw3270_request *rq, void *data)
  * Update console display.
  */
 static void
-con3270_update(struct con3270 *cp)
+con3270_update(struct timer_list *t)
 {
+        struct con3270 *cp = from_timer(cp, t, timer);
         struct raw3270_request *wrq;
         char wcc, prolog[6];
         unsigned long flags;
@@ -552,7 +553,7 @@ con3270_flush(void)
         con3270_update_status(cp);
         while (cp->update_flags != 0) {
                 spin_unlock_irqrestore(&cp->view.lock, flags);
-                con3270_update(cp);
+                con3270_update(&cp->timer);
                 spin_lock_irqsave(&cp->view.lock, flags);
                 con3270_wait_write(cp);
         }
@@ -623,8 +624,7 @@ con3270_init(void)
 
         INIT_LIST_HEAD(&condev->lines);
         INIT_LIST_HEAD(&condev->update);
-        setup_timer(&condev->timer, (void (*)(unsigned long)) con3270_update,
-                    (unsigned long) condev);
+        timer_setup(&condev->timer, con3270_update, 0);
         tasklet_init(&condev->readlet, 
                      (void (*)(unsigned long)) con3270_read_tasklet,
                      (unsigned long) condev->read);