Skip to content

Commit

Permalink
Kobject: convert fs/char_dev.c to use kobject_init/add_ng()
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
gregkh committed Jan 25, 2008
1 parent 78be3d2 commit a5815dd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions fs/char_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,8 @@ struct cdev *cdev_alloc(void)
{
struct cdev *p = kzalloc(sizeof(struct cdev), GFP_KERNEL);
if (p) {
p->kobj.ktype = &ktype_cdev_dynamic;
INIT_LIST_HEAD(&p->list);
kobject_init(&p->kobj);
kobject_init_ng(&p->kobj, &ktype_cdev_dynamic);
}
return p;
}
Expand All @@ -529,8 +528,7 @@ void cdev_init(struct cdev *cdev, const struct file_operations *fops)
{
memset(cdev, 0, sizeof *cdev);
INIT_LIST_HEAD(&cdev->list);
cdev->kobj.ktype = &ktype_cdev_default;
kobject_init(&cdev->kobj);
kobject_init_ng(&cdev->kobj, &ktype_cdev_default);
cdev->ops = fops;
}

Expand Down

0 comments on commit a5815dd

Please sign in to comment.