diff options
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 06e8738ab263..e88170293ca0 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -602,7 +602,7 @@ static struct kobject *get_device_parent(struct device *dev, | |||
602 | if (!k) | 602 | if (!k) |
603 | return NULL; | 603 | return NULL; |
604 | k->kset = &dev->class->class_dirs; | 604 | k->kset = &dev->class->class_dirs; |
605 | retval = kobject_add_ng(k, parent_kobj, "%s", dev->class->name); | 605 | retval = kobject_add(k, parent_kobj, "%s", dev->class->name); |
606 | if (retval < 0) { | 606 | if (retval < 0) { |
607 | kobject_put(k); | 607 | kobject_put(k); |
608 | return NULL; | 608 | return NULL; |
@@ -776,7 +776,7 @@ static void device_remove_class_symlinks(struct device *dev) | |||
776 | * This is part 2 of device_register(), though may be called | 776 | * This is part 2 of device_register(), though may be called |
777 | * separately _iff_ device_initialize() has been called separately. | 777 | * separately _iff_ device_initialize() has been called separately. |
778 | * | 778 | * |
779 | * This adds it to the kobject hierarchy via kobject_add_ng(), adds it | 779 | * This adds it to the kobject hierarchy via kobject_add(), adds it |
780 | * to the global and sibling lists for the device, then | 780 | * to the global and sibling lists for the device, then |
781 | * adds it to the other relevant subsystems of the driver model. | 781 | * adds it to the other relevant subsystems of the driver model. |
782 | */ | 782 | */ |
@@ -807,7 +807,7 @@ int device_add(struct device *dev) | |||
807 | goto Error; | 807 | goto Error; |
808 | 808 | ||
809 | /* first, register with generic layer. */ | 809 | /* first, register with generic layer. */ |
810 | error = kobject_add_ng(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); | 810 | error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); |
811 | if (error) | 811 | if (error) |
812 | goto Error; | 812 | goto Error; |
813 | 813 | ||