Re: [PATCH] TTY changes for 2.5.69

From: Greg KH (greg@kroah.com)
Date: Wed May 07 2003 - 18:16:28 EST


ChangeSet 1.1113, 2003/05/07 15:02:02-07:00, hannal@us.ibm.com

[PATCH] isdn/capi tty_driver add .owner field remove MOD_INC/DEC_USE_COUNT

 drivers/isdn/capi/capi.c | 8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)

diff -Nru a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
--- a/drivers/isdn/capi/capi.c Wed May 7 16:00:12 2003
+++ b/drivers/isdn/capi/capi.c Wed May 7 16:00:12 2003
@@ -200,10 +200,8 @@
         unsigned int minor = 0;
         unsigned long flags;
   
- MOD_INC_USE_COUNT;
         mp = kmalloc(sizeof(*mp), GFP_ATOMIC);
           if (!mp) {
- MOD_DEC_USE_COUNT;
                   printk(KERN_ERR "capi: can't alloc capiminor\n");
                 return 0;
         }
@@ -249,7 +247,6 @@
         skb_queue_purge(&mp->outqueue);
         capiminor_del_all_ack(mp);
         kfree(mp);
- MOD_DEC_USE_COUNT;
 }
 
 struct capiminor *capiminor_find(unsigned int minor)
@@ -1280,6 +1277,7 @@
         
         memset(drv, 0, sizeof(struct tty_driver));
         drv->magic = TTY_DRIVER_MAGIC;
+ drv->owner = THIS_MODULE;
         drv->driver_name = "capi_nc";
         drv->name = "capi/";
         drv->major = capi_ttymajor;
@@ -1460,7 +1458,6 @@
         char *p;
         char *compileinfo;
 
- MOD_INC_USE_COUNT;
 
         if ((p = strchr(revision, ':')) != 0 && p[1]) {
                 strncpy(rev, p + 2, sizeof(rev));
@@ -1472,7 +1469,6 @@
 
         if (register_chrdev(capi_major, "capi20", &capi_fops)) {
                 printk(KERN_ERR "capi20: unable to get major %d\n", capi_major);
- MOD_DEC_USE_COUNT;
                 return -EIO;
         }
 
@@ -1484,7 +1480,6 @@
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         if (capinc_tty_init() < 0) {
                 unregister_chrdev(capi_major, "capi20");
- MOD_DEC_USE_COUNT;
                 return -ENOMEM;
         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
@@ -1503,7 +1498,6 @@
         printk(KERN_NOTICE "capi20: Rev %s: started up with major %d%s\n",
                                 rev, capi_major, compileinfo);
 
- MOD_DEC_USE_COUNT;
         return 0;
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed May 07 2003 - 22:00:33 EST