Commit a5815ddf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Kobject: convert fs/char_dev.c to use kobject_init/add_ng()

This converts the code to use the new kobject functions, cleaning up the
logic in doing so.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 78be3d2f
...@@ -510,9 +510,8 @@ struct cdev *cdev_alloc(void) ...@@ -510,9 +510,8 @@ struct cdev *cdev_alloc(void)
{ {
struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL); struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL);
if (p) { if (p) {
p->kobj.ktype = &ktype_cdev_dynamic;
INIT_LIST_HEAD(&p->list); INIT_LIST_HEAD(&p->list);
kobject_init(&p->kobj); kobject_init_ng(&p->kobj, &ktype_cdev_dynamic);
} }
return p; return p;
} }
...@@ -529,8 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops) ...@@ -529,8 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops)
{ {
memset(cdev, 0, sizeof *cdev); memset(cdev, 0, sizeof *cdev);
INIT_LIST_HEAD(&cdev->list); INIT_LIST_HEAD(&cdev->list);
cdev->kobj.ktype = &ktype_cdev_default; kobject_init_ng(&cdev->kobj, &ktype_cdev_default);
kobject_init(&cdev->kobj);
cdev->ops = fops; cdev->ops = fops;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment