This converts the code to use the new kobject functions, cleaning up the

logic in doing so.
Cc: Kay Sievers

Signed-off-by: Greg Kroah-Hartman

---

 fs/char_dev.c |    6 ++----

 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/char_dev.c b/fs/char_dev.c

index c3bfa76..b2dd5a0 100644

--- a/fs/char_dev.c

+++ b/fs/char_dev.c

@@ -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;

 }

@@ -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;

 }
--

1.5.3.8
--

unsubscribe notice
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/