patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ppc / 8xx_io / uart.c

diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
index d0701bd..7acc703 100644 (file)
--- a/arch/ppc/8xx_io/uart.c
+++ b/arch/ppc/8xx_io/uart.c
@@ -583,9 +583,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
 #ifdef SERIAL_DEBUG_OPEN
                        printk("scheduling hangup...");
 #endif
-                       MOD_INC_USE_COUNT;
-                       if (schedule_task(&info->tqueue_hangup) == 0)
-                               MOD_DEC_USE_COUNT;
+                       schedule_task(&info->tqueue_hangup);
                }
        }
        if (info->flags & ASYNC_CTS_FLOW) {
@@ -719,7 +717,6 @@ static void do_serial_hangup(void *private_)
        tty = info->tty;
        if (tty)
                tty_hangup(tty);
-       MOD_DEC_USE_COUNT;
 }
 
 /*static void rs_8xx_timer(void)
@@ -1664,7 +1661,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
 
        if (tty_hung_up_p(filp)) {
                DBG_CNT("before DEC-hung");
-               MOD_DEC_USE_COUNT;
                restore_flags(flags);
                return;
        }
@@ -1691,7 +1687,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
        }
        if (state->count) {
                DBG_CNT("before DEC-2");
-               MOD_DEC_USE_COUNT;
                restore_flags(flags);
                return;
        }
@@ -1746,7 +1741,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
        }
        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
        wake_up_interruptible(&info->close_wait);
-       MOD_DEC_USE_COUNT;
        restore_flags(flags);
 }
 
@@ -2008,14 +2002,12 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
        if (retval)
                return retval;
 
-       MOD_INC_USE_COUNT;
        retval = block_til_ready(tty, filp, info);
        if (retval) {
 #ifdef SERIAL_DEBUG_OPEN
                printk("rs_open returning after block_til_ready with %d\n",
                       retval);
 #endif
-               MOD_DEC_USE_COUNT;
                return retval;
        }
 
@@ -2520,6 +2512,7 @@ static int __init rs_8xx_init(void)
 
        /* Initialize the tty_driver structure */
 
+       serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = "serial";
        serial_driver->devfs_name = "tts/";
        serial_driver->name = "ttyS";