diff options
| author | Greg KH <gregkh@3(NXDOMAIN).(none)> | 2007-12-03 12:06:52 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@3(NXDOMAIN).(none)> | 2007-12-03 12:06:52 -0800 |
| commit | 1ec0d5f93f7b7a50a7a98898b466cfb0c817dd5a (patch) | |
| tree | dec43c00da53dec1b6893e05c29ae0507bdccf20 /f2.patch | |
| parent | f0f81e72fda6a4099820f81643a852ea7cc0100d (diff) | |
| download | patches-1ec0d5f93f7b7a50a7a98898b466cfb0c817dd5a.tar.gz | |
updated f2.patch with more kobject_init_ng conversions
Diffstat (limited to 'f2.patch')
| -rw-r--r-- | f2.patch | 69 |
1 files changed, 62 insertions, 7 deletions
diff --git a/f2.patch b/f2.patch index 0e152915ef0d2b..d098a6bfd08211 100644 --- a/f2.patch +++ b/f2.patch @@ -1,12 +1,67 @@ --- - fs/char_dev.c | 6 ++---- - kernel/module.c | 14 ++++++-------- - kernel/params.c | 6 ++---- - kernel/user.c | 9 ++++----- - mm/slub.c | 9 ++++----- - net/bridge/br_if.c | 10 +++------- - 6 files changed, 21 insertions(+), 33 deletions(-) + drivers/base/class.c | 10 +++------- + drivers/base/core.c | 6 ++---- + fs/char_dev.c | 6 ++---- + kernel/module.c | 14 ++++++-------- + kernel/params.c | 6 ++---- + kernel/user.c | 9 ++++----- + mm/slub.c | 9 ++++----- + net/bridge/br_if.c | 10 +++------- + 8 files changed, 26 insertions(+), 44 deletions(-) +--- a/drivers/base/class.c ++++ b/drivers/base/class.c +@@ -553,8 +553,7 @@ static struct class_device_attribute cla + void class_device_initialize(struct class_device *class_dev) + { + class_dev->kobj.kset = &class_obj_subsys; +- class_dev->kobj.ktype = &class_device_ktype; +- kobject_init(&class_dev->kobj); ++ kobject_init_ng(&class_dev->kobj, &class_device_ktype); + INIT_LIST_HEAD(&class_dev->node); + } + +@@ -582,16 +581,13 @@ int class_device_add(struct class_device + class_dev->class_id); + + /* first, register with generic layer. */ +- error = kobject_set_name(&class_dev->kobj, "%s", class_dev->class_id); +- if (error) +- goto out2; +- + if (parent_class_dev) + class_dev->kobj.parent = &parent_class_dev->kobj; + else + class_dev->kobj.parent = &parent_class->subsys.kobj; + +- error = kobject_add(&class_dev->kobj); ++ error = kobject_add_ng(&class_dev->kobj, class_dev->kobj.parent, ++ "%s", class_dev->class_id); + if (error) + goto out2; + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -526,8 +526,7 @@ static void klist_children_put(struct kl + void device_initialize(struct device *dev) + { + dev->kobj.kset = devices_kset; +- dev->kobj.ktype = &device_ktype; +- kobject_init(&dev->kobj); ++ kobject_init_ng(&dev->kobj, &device_ktype); + klist_init(&dev->klist_children, klist_children_get, + klist_children_put); + INIT_LIST_HEAD(&dev->dma_pools); +@@ -804,8 +803,7 @@ int device_add(struct device *dev) + goto Error; + + /* first, register with generic layer. */ +- kobject_set_name(&dev->kobj, "%s", dev->bus_id); +- error = kobject_add(&dev->kobj); ++ error = kobject_add_ng(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); + if (error) + goto Error; + --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -510,9 +510,8 @@ struct cdev *cdev_alloc(void) |