2 files changed, 1 insertions, 23 deletions

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 1f27be1ec3d4..c645455c3fd1 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -627,7 +627,6 @@ static int	stli_initopen(struct stlibrd *brdp, struct stliport *portp);
 static int      stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
 static int      stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
 static int      stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct file *filp);
-static void     stli_dohangup(struct work_struct *);
 static int      stli_setport(struct stliport *portp);
 static int      stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
 static void     stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
@@ -1824,25 +1823,6 @@ static void stli_start(struct tty_struct *tty)
 /*****************************************************************************/
 
 /*
- *      Scheduler called hang up routine. This is called from the scheduler,
- *      not direct from the driver "poll" routine. We can't call it there
- *      since the real local hangup code will enable/disable the board and
- *      other things that we can't do while handling the poll. Much easier
- *      to deal with it some time later (don't really care when, hangups
- *      aren't that time critical).
- */
-
-static void stli_dohangup(struct work_struct *ugly_api)
-{
-        struct stliport *portp = container_of(ugly_api, struct stliport, tqhangup);
-        if (portp->tty != NULL) {
-                tty_hangup(portp->tty);
-        }
-}
-
-/*****************************************************************************/
-
-/*
  *      Hangup this port. This is pretty much like closing the port, only
  *      a little more brutal. No waiting for data to drain. Shutdown the
  *      port and maybe drop signals. This is rather tricky really. We want
@@ -2405,7 +2385,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
                             ((portp->sigs & TIOCM_CD) == 0)) {
                                 if (portp->flags & ASYNC_CHECK_CD) {
                                         if (tty)
-                                                schedule_work(&portp->tqhangup);
+                                                tty_hangup(tty);
                                 }
                         }
                 }
@@ -2733,7 +2713,6 @@ static int stli_initports(struct stlibrd *brdp)
                 portp->baud_base = STL_BAUDBASE;
                 portp->close_delay = STL_CLOSEDELAY;
                 portp->closing_wait = 30 * HZ;
-                INIT_WORK(&portp->tqhangup, stli_dohangup);
                 init_waitqueue_head(&portp->open_wait);
                 init_waitqueue_head(&portp->close_wait);
                 init_waitqueue_head(&portp->raw_wait);
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 106a5e85e5c4..5a84fe944b74 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -71,7 +71,6 @@ struct stliport {
         wait_queue_head_t       open_wait;
         wait_queue_head_t       close_wait;
         wait_queue_head_t       raw_wait;
-        struct work_struct      tqhangup;
         struct asysigs          asig;
         unsigned long           addr;
         unsigned long           rxoffset;