TTY: isdn, do not play with module refcounts

The module which called allocate_tty_driver is already refcounted by
the TTY layer automatically. And since THIS_MODULE is isdn_tty and it
allocated the tty_driver, there is no need to do the counts in isdn's
tty->ops->open/close.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index bcf4bbe693bc249ee6b323a93ae0765c364808b7..1ff307276d2d3c8bb4090dffdcf7e70fd2cd0e82 100644 (file)
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1584,10 +1584,6 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
        info = &dev->mdm.info[tty->index];
        if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open"))
                return -ENODEV;
-       if (!try_module_get(info->owner)) {
-               printk(KERN_WARNING "%s: cannot reserve module\n", __func__);
-               return -ENODEV;
-       }
 #ifdef ISDN_DEBUG_MODEM_OPEN
        printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
               info->count);
@@ -1603,7 +1599,6 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
 #ifdef ISDN_DEBUG_MODEM_OPEN
                printk(KERN_DEBUG "isdn_tty_open return after startup\n");
 #endif
-               module_put(info->owner);
                return retval;
        }
        retval = isdn_tty_block_til_ready(tty, filp, info);
@@ -1611,7 +1606,6 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
 #ifdef ISDN_DEBUG_MODEM_OPEN
                printk(KERN_DEBUG "isdn_tty_open return after isdn_tty_block_til_ready \n");
 #endif
-               module_put(info->owner);
                return retval;
        }
 #ifdef ISDN_DEBUG_MODEM_OPEN
@@ -1659,7 +1653,6 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
 #ifdef ISDN_DEBUG_MODEM_OPEN
                printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
 #endif
-               module_put(info->owner);
                return;
        }
        info->flags |= ASYNC_CLOSING;
@@ -1692,7 +1685,6 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
        info->tty = NULL;
        info->ncarrier = 0;
        tty->closing = 0;
-       module_put(info->owner);
        if (info->blocked_open) {
                msleep_interruptible(500);
                wake_up_interruptible(&info->open_wait);
@@ -1879,9 +1871,6 @@ isdn_tty_modem_init(void)
                        retval = -ENOMEM;
                        goto err_unregister;
                }
-#endif
-#ifdef MODULE
-               info->owner = THIS_MODULE;
 #endif
                spin_lock_init(&info->readlock);
                sprintf(info->last_cause, "0000");

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 1b4b4c1846c57b049c0946141f5cbf249fedae38..66d9d71e003c5fc6efe8089df327117f6228ad2c 100644 (file)
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -435,7 +435,6 @@ typedef struct atemu {
 /* Private data (similar to async_struct in <linux/serial.h>) */
 typedef struct modem_info {
   int                  magic;
-  struct module                *owner;
   int                  flags;           /* defined in tty.h               */
   int                  x_char;          /* xon/xoff character             */
   int                  mcr;             /* Modem control register         */