aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-18 01:05:35 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:38 -0500
commitf9cb074bff8e762ef24c44678a5a7d907f82fbeb (patch)
tree50438fc90b8f6170dd8eb5d43712c61719a16304 /fs
parente1543ddf739b22a8c4218716ad50c26b3e147403 (diff)
Kobject: rename kobject_init_ng() to kobject_init()
Now that the old kobject_init() function is gone, rename kobject_init_ng() to kobject_init() to clean up the namespace. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/char_dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c
index b2dd5a036631..2c7a8b5b4598 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -511,7 +511,7 @@ struct cdev *cdev_alloc(void)
511 struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL); 511 struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL);
512 if (p) { 512 if (p) {
513 INIT_LIST_HEAD(&p->list); 513 INIT_LIST_HEAD(&p->list);
514 kobject_init_ng(&p->kobj, &ktype_cdev_dynamic); 514 kobject_init(&p->kobj, &ktype_cdev_dynamic);
515 } 515 }
516 return p; 516 return p;
517} 517}
@@ -528,7 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops)
528{ 528{
529 memset(cdev, 0, sizeof *cdev); 529 memset(cdev, 0, sizeof *cdev);
530 INIT_LIST_HEAD(&cdev->list); 530 INIT_LIST_HEAD(&cdev->list);
531 kobject_init_ng(&cdev->kobj, &ktype_cdev_default); 531 kobject_init(&cdev->kobj, &ktype_cdev_default);
532 cdev->ops = fops; 532 cdev->ops = fops;
533} 533}
534 534