[PATCH] tty_driver add .owner field remove MOD_INC_DEC_USE_COUNT

From:  Hanna Linder <hannal@us.ibm.com>

  Here are the changes for s390 to set .owner for tty_drivers
  and remove MOD_INC/DEC_USE_COUNT. Martin has already approved
  this.

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index a69cdccf1759cbc3bf32d4254e9e5676deaf3c95..adcd293b01297368f5f5a8f406424cb52e024b0c 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -1178,6 +1178,7 @@ tty3215_init(void)
 
        memset(&tty3215_driver, 0, sizeof(struct tty_driver));
        tty3215_driver.magic = TTY_DRIVER_MAGIC;
+       tty3215_driver.owner = THIS_MODULE;
        tty3215_driver.driver_name = "tty3215";
        tty3215_driver.name = "ttyS";
        tty3215_driver.name_base = 0;

diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index c9eefc173593bea0f08418f93c0e4a06203ca311..b77af9e2c8edc4558ffa64377228e7448d15bf75 100644 (file)
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -743,6 +743,7 @@ sclp_tty_init(void)
 
        memset (&sclp_tty_driver, 0, sizeof(struct tty_driver));
        sclp_tty_driver.magic = TTY_DRIVER_MAGIC;
+       sclp_tty_driver.owner = THIS_MODULE;
        sclp_tty_driver.driver_name = "tty_sclp";
        sclp_tty_driver.name = "ttyS";
        sclp_tty_driver.name_base = 0;

diff --git a/drivers/s390/char/tuball.c b/drivers/s390/char/tuball.c
index 64646a6e5d6a1f1cc4f109e2d4874fc79308ee5d..b9ceb8c2b7d2f83ac78d9c68ba46a73106b57b81 100644 (file)
--- a/drivers/s390/char/tuball.c
+++ b/drivers/s390/char/tuball.c
@@ -218,18 +218,6 @@ cleanup_module(void)
 }
 #endif /* Not a MODULE or a MODULE */
 
-void
-tub_inc_use_count(void)
-{
-       MOD_INC_USE_COUNT;
-}
-
-void
-tub_dec_use_count(void)
-{
-       MOD_DEC_USE_COUNT;
-}
-
 static int
 tub3270_is_ours(s390_dev_info_t *dp)
 {

diff --git a/drivers/s390/char/tubfs.c b/drivers/s390/char/tubfs.c
index 464223197fa08093e3aa0d309d4a028248289449..04ce2a08108f9adda8fb02faf3c4516a399749f0 100644 (file)
--- a/drivers/s390/char/tubfs.c
+++ b/drivers/s390/char/tubfs.c
@@ -118,7 +118,6 @@ fs3270_open(struct inode *ip, struct file *fp)
                return -EBUSY;
        }
 
-       tub_inc_use_count();
        fp->private_data = ip;
        tubp->mode = TBM_FS;
        tubp->intv = fs3270_int;
@@ -144,7 +143,6 @@ fs3270_close(struct inode *ip, struct file *fp)
        fs3270_wait(tubp, &flags);
        tubp->fsopen = 0;
        tubp->fs_pid = 0;
-       tub_dec_use_count();
        tubp->intv = NULL;
        tubp->mode = 0;
        tty3270_refresh(tubp);
@@ -165,7 +163,6 @@ fs3270_release(tub_t *tubp)
        fs3270_wait(tubp, &flags);
        tubp->fsopen = 0;
        tubp->fs_pid = 0;
-       tub_dec_use_count();
        tubp->intv = NULL;
        tubp->mode = 0;
        /*tty3270_refresh(tubp);*/

diff --git a/drivers/s390/char/tubio.h b/drivers/s390/char/tubio.h
index 449b406f43f517fd0537910c4f75257033ff2605..c5533a95b1dd39965efe407902f805cd99520c27 100644 (file)
--- a/drivers/s390/char/tubio.h
+++ b/drivers/s390/char/tubio.h
@@ -421,8 +421,6 @@ extern inline tub_t *TTY2TUB(struct tty_struct *tty)
        return tubp;
 }
 
-extern void tub_inc_use_count(void);
-extern void tub_dec_use_count(void);
 extern int tub3270_movedata(bcb_t *, bcb_t *, int);
 #if 0
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))

diff --git a/drivers/s390/char/tubtty.c b/drivers/s390/char/tubtty.c
index 87a185c5579d14655c2b20e3adaf8fd42610b308..b7b6a5a3c489c2dd37bd5df57a9c51a85e6f4bd7 100644 (file)
--- a/drivers/s390/char/tubtty.c
+++ b/drivers/s390/char/tubtty.c
@@ -80,6 +80,7 @@ tty3270_init(void)
 
        /* Initialize for tty driver */
        td->magic = TTY_DRIVER_MAGIC;
+       td->owner = THIS_MODULE;
        td->driver_name = "tty3270";
        td->name = "tty3270";
        td->major = IBM_TTY3270_MAJOR;
@@ -189,7 +190,6 @@ tty3270_open(struct tty_struct *tty, struct file *filp)
                return -ENODEV;
        }
 
-       tub_inc_use_count();
        if ((rc = tty3270_wait(tubp, &flags)) != 0)
                goto do_fail;
        if (tubp->lnopen > 0) {
@@ -231,7 +231,6 @@ do_fail:
        tty3270_aid_fini(tubp);
        tty3270_rcl_fini(tubp);
        TUBUNLOCK(tubp->irq, flags);
-       tub_dec_use_count();
        return rc;
 }
 
@@ -253,7 +252,6 @@ tty3270_close(struct tty_struct *tty, struct file *filp)
        tty3270_rcl_fini(tubp);
        tty3270_scl_fini(tubp);
 do_return:
-       tub_dec_use_count();
        TUBUNLOCK(tubp->irq, flags);
 }