diff options
| author | Greg KH <gregkh@t43.kroah.org> | 2007-12-04 08:43:14 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@t43.kroah.org> | 2007-12-04 08:43:14 -0800 |
| commit | 8504557d23887bba6817510833415335bf3ef0ba (patch) | |
| tree | 4bedb7b5fc90917d8ad0f897f29621b3c32f71c2 /driver | |
| parent | d78d0d49af579de402ffc09a8567084b945c58e1 (diff) | |
| download | patches-8504557d23887bba6817510833415335bf3ef0ba.tar.gz | |
more s/_create/_add/ changes
Diffstat (limited to 'driver')
24 files changed, 95 insertions, 104 deletions
diff --git a/driver/kobject-convert-configfs-to-use-kobject_create.patch b/driver/kobject-convert-configfs-to-use-kobject_create.patch index 0ccd4413b373b9..95eb1adb063b37 100644 --- a/driver/kobject-convert-configfs-to-use-kobject_create.patch +++ b/driver/kobject-convert-configfs-to-use-kobject_create.patch @@ -12,8 +12,8 @@ Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - fs/configfs/mount.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + fs/configfs/mount.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) --- a/fs/configfs/mount.c +++ b/fs/configfs/mount.c @@ -26,20 +26,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __init configfs_init(void) { -@@ -140,9 +140,9 @@ static int __init configfs_init(void) +@@ -140,9 +140,8 @@ static int __init configfs_init(void) if (!configfs_dir_cachep) goto out; - config_subsys.kobj.kset = &kernel_subsys; - err = subsystem_register(&config_subsys); - if (err) { -+ config_kobj = kobject_create_and_register("config", -+ &kernel_subsys.kobj); ++ config_kobj = kobject_create_and_add("config", &kernel_subsys.kobj); + if (!config_kobj) { kmem_cache_destroy(configfs_dir_cachep); configfs_dir_cachep = NULL; goto out; -@@ -151,7 +151,7 @@ static int __init configfs_init(void) +@@ -151,7 +150,7 @@ static int __init configfs_init(void) err = register_filesystem(&configfs_fs_type); if (err) { printk(KERN_ERR "configfs: Unable to register filesystem!\n"); @@ -48,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kmem_cache_destroy(configfs_dir_cachep); configfs_dir_cachep = NULL; goto out; -@@ -160,7 +160,7 @@ static int __init configfs_init(void) +@@ -160,7 +159,7 @@ static int __init configfs_init(void) err = configfs_inode_init(); if (err) { unregister_filesystem(&configfs_fs_type); @@ -57,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kmem_cache_destroy(configfs_dir_cachep); configfs_dir_cachep = NULL; } -@@ -171,7 +171,7 @@ out: +@@ -171,7 +170,7 @@ out: static void __exit configfs_exit(void) { unregister_filesystem(&configfs_fs_type); diff --git a/driver/kobject-convert-debugfs-to-use-kobject_create.patch b/driver/kobject-convert-debugfs-to-use-kobject_create.patch index c5f3c594f50783..272d823c9a84d7 100644 --- a/driver/kobject-convert-debugfs-to-use-kobject_create.patch +++ b/driver/kobject-convert-debugfs-to-use-kobject_create.patch @@ -11,12 +11,12 @@ Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - fs/debugfs/inode.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + fs/debugfs/inode.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c -@@ -426,20 +426,20 @@ exit: +@@ -426,20 +426,19 @@ exit: } EXPORT_SYMBOL_GPL(debugfs_rename); @@ -31,8 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - retval = subsystem_register(&debug_subsys); - if (retval) - return retval; -+ debug_kobj = kobject_create_and_register("debug", -+ &kernel_subsys.kobj); ++ debug_kobj = kobject_create_and_add("debug", &kernel_subsys.kobj); + if (!debug_kobj) + return -EINVAL; @@ -43,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return retval; } -@@ -447,7 +447,7 @@ static void __exit debugfs_exit(void) +@@ -447,7 +446,7 @@ static void __exit debugfs_exit(void) { simple_release_fs(&debugfs_mount, &debugfs_mount_count); unregister_filesystem(&debug_fs_type); diff --git a/driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch b/driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch index e7df0b1827b5fe..d33ce6a028557c 100644 --- a/driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch +++ b/driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch @@ -12,22 +12,21 @@ Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - fs/ecryptfs/main.c | 3 +-- + fs/ecryptfs/main.c | 2 +- fs/fuse/inode.c | 2 +- fs/gfs2/sys.c | 2 +- fs/namespace.c | 11 +++++------ include/linux/fs.h | 2 +- - 5 files changed, 9 insertions(+), 11 deletions(-) + 5 files changed, 9 insertions(+), 10 deletions(-) --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c -@@ -794,8 +794,7 @@ static int do_sysfs_registration(void) +@@ -794,7 +794,7 @@ static int do_sysfs_registration(void) { int rc; -- ecryptfs_kset = kset_create_and_register("ecryptfs", NULL, -- &fs_subsys.kobj); -+ ecryptfs_kset = kset_create_and_register("ecryptfs", NULL, fs_kobj); +- ecryptfs_kset = kset_create_and_add("ecryptfs", NULL, &fs_subsys.kobj); ++ ecryptfs_kset = kset_create_and_add("ecryptfs", NULL, fs_kobj); if (!ecryptfs_kset) { printk(KERN_ERR "Unable to create ecryptfs kset\n"); rc = -ENOMEM; @@ -37,8 +36,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { int err; -- fuse_kobj = kobject_create_and_register("fuse", &fs_subsys.kobj); -+ fuse_kobj = kobject_create_and_register("fuse", fs_kobj); +- fuse_kobj = kobject_create_and_add("fuse", &fs_subsys.kobj); ++ fuse_kobj = kobject_create_and_add("fuse", fs_kobj); if (!fuse_kobj) { err = -ENOMEM; goto out_err; @@ -74,9 +73,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - if (err) - printk(KERN_WARNING "%s: subsystem_register error: %d\n", - __FUNCTION__, err); -+ fs_kobj = kobject_create_and_register("fs", NULL); ++ fs_kobj = kobject_create_and_add("fs", NULL); + if (!fs_kobj) -+ printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); ++ printk(KERN_WARNING "%s: kobj create error\n", __FUNCTION__); init_rootfs(); init_mount_tree(); } diff --git a/driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch b/driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch index 37b5d0b8ff813d..4dfa6661865321 100644 --- a/driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch +++ b/driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - s390_subsys.kobj.parent = hypervisor_kobj; - rc = subsystem_register(&s390_subsys); - if (rc) -+ s390_kobj = kobject_create_and_register("s390", hypervisor_kobj); ++ s390_kobj = kobject_create_and_add("s390", hypervisor_kobj); + if (!s390_kobj) { + rc = -ENOMEM;; goto fail_sysfs; diff --git a/driver/kobject-convert-securityfs-to-use-kobject_create.patch b/driver/kobject-convert-securityfs-to-use-kobject_create.patch index 80c00754a25699..6625f118f2a1dd 100644 --- a/driver/kobject-convert-securityfs-to-use-kobject_create.patch +++ b/driver/kobject-convert-securityfs-to-use-kobject_create.patch @@ -12,12 +12,12 @@ Acked-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - security/inode.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + security/inode.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) --- a/security/inode.c +++ b/security/inode.c -@@ -315,20 +315,20 @@ void securityfs_remove(struct dentry *de +@@ -315,20 +315,19 @@ void securityfs_remove(struct dentry *de } EXPORT_SYMBOL_GPL(securityfs_remove); @@ -32,8 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - retval = subsystem_register(&security_subsys); - if (retval) - return retval; -+ security_kobj = kobject_create_and_register("security", -+ &kernel_subsys.kobj); ++ security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj); + if (!security_kobj) + return -EINVAL; diff --git a/driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch b/driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch index e7c52caddb62a2..347fbdd358b3a3 100644 --- a/driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch +++ b/driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch @@ -55,14 +55,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int __init hypervisor_init(void) { - return subsystem_register(&hypervisor_subsys); -+ hypervisor_kobj = kobject_create_and_register("hypervisor", NULL); ++ hypervisor_kobj = kobject_create_and_add("hypervisor", NULL); + if (!hypervisor_kobj) + return -ENOMEM; + return 0; } --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -190,8 +190,8 @@ struct kset _name##_subsys = { \ +@@ -196,8 +196,8 @@ struct kset _name##_subsys = { \ /* The global /sys/kernel/ kset for people to chain off of */ extern struct kset *kernel_kset; diff --git a/driver/kset-convert-dlm-to-use-kset_create.patch b/driver/kset-convert-dlm-to-use-kset_create.patch index 0f84a0a13ab108..6195e8e33244c3 100644 --- a/driver/kset-convert-dlm-to-use-kset_create.patch +++ b/driver/kset-convert-dlm-to-use-kset_create.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - if (error) - printk("dlm_lockspace_init: cannot register kset %d\n", error); - return error; -+ dlm_kset = kset_create_and_register("dlm", NULL, &kernel_subsys.kobj); ++ dlm_kset = kset_create_and_add("dlm", NULL, &kernel_subsys.kobj); + if (!dlm_kset) { + printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); + return -ENOMEM; diff --git a/driver/kset-convert-drivers-base-bus.c-kset_create_and_register.patch b/driver/kset-convert-drivers-base-bus.c-kset_create_and_register.patch index aa8e6df134db80..338546e159fe32 100644 --- a/driver/kset-convert-drivers-base-bus.c-kset_create_and_register.patch +++ b/driver/kset-convert-drivers-base-bus.c-kset_create_and_register.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int __init buses_init(void) { - return subsystem_register(&bus_subsys); -+ bus_kset = kset_create_and_register("bus", &bus_uevent_ops, NULL); ++ bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL); + if (!bus_kset) + return -ENOMEM; + return 0; diff --git a/driver/kset-convert-drivers-base-class.c-kset_create_and_register.patch b/driver/kset-convert-drivers-base-class.c-kset_create_and_register.patch index a74a9d05ba050a..b3e90b9b7ac595 100644 --- a/driver/kset-convert-drivers-base-class.c-kset_create_and_register.patch +++ b/driver/kset-convert-drivers-base-class.c-kset_create_and_register.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - retval = subsystem_register(&class_subsys); - if (retval) - return retval; -+ class_kset = kset_create_and_register("class", NULL, NULL); ++ class_kset = kset_create_and_add("class", NULL, NULL); + if (!class_kset) + return -ENOMEM; diff --git a/driver/kset-convert-drivers-base-firmware.c-kset_create_and_register.patch b/driver/kset-convert-drivers-base-firmware.c-kset_create_and_register.patch index 65e1b73a411ede..5b390b9eff16bb 100644 --- a/driver/kset-convert-drivers-base-firmware.c-kset_create_and_register.patch +++ b/driver/kset-convert-drivers-base-firmware.c-kset_create_and_register.patch @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int __init firmware_init(void) { - return subsystem_register(&firmware_subsys); -+ firmware_kset = kset_create_and_register("firmware", NULL, NULL); ++ firmware_kset = kset_create_and_add("firmware", NULL, NULL); + if (!firmware_kset) + return -ENOMEM; + return 0; diff --git a/driver/kset-convert-ecryptfs-to-use-kset_create.patch b/driver/kset-convert-ecryptfs-to-use-kset_create.patch index b58c6d9e945aca..f38d7473ceb2f8 100644 --- a/driver/kset-convert-ecryptfs-to-use-kset_create.patch +++ b/driver/kset-convert-ecryptfs-to-use-kset_create.patch @@ -12,8 +12,8 @@ Cc: Phillip Hellewell <phillip@hellewell.homeip.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - fs/ecryptfs/main.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + fs/ecryptfs/main.c | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static ssize_t version_show(struct kset *kset, char *buff) { -@@ -794,18 +794,18 @@ static int do_sysfs_registration(void) +@@ -794,18 +794,17 @@ static int do_sysfs_registration(void) { int rc; @@ -35,8 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - if (rc) { - printk(KERN_ERR - "Unable to register ecryptfs sysfs subsystem\n"); -+ ecryptfs_kset = kset_create_and_register("ecryptfs", NULL, -+ &fs_subsys.kobj); ++ ecryptfs_kset = kset_create_and_add("ecryptfs", NULL, &fs_subsys.kobj); + if (!ecryptfs_kset) { + printk(KERN_ERR "Unable to create ecryptfs kset\n"); + rc = -ENOMEM; @@ -52,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } out: return rc; -@@ -813,8 +813,8 @@ out: +@@ -813,8 +812,8 @@ out: static void do_sysfs_unregistration(void) { diff --git a/driver/kset-convert-gfs2-dlm-to-use-kset_create.patch b/driver/kset-convert-gfs2-dlm-to-use-kset_create.patch index e73a76ffec0b65..5882ac25d40f79 100644 --- a/driver/kset-convert-gfs2-dlm-to-use-kset_create.patch +++ b/driver/kset-convert-gfs2-dlm-to-use-kset_create.patch @@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - printk("lock_dlm: cannot register kset %d\n", error); - - return error; -+ gdlm_kset = kset_create_and_register("lock_dlm", NULL, -+ &kernel_subsys.kobj); ++ gdlm_kset = kset_create_and_add("lock_dlm", NULL, ++ &kernel_subsys.kobj); + if (!gdlm_kset) { + printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); + return -ENOMEM; diff --git a/driver/kset-convert-gfs2-to-use-kset_create.patch b/driver/kset-convert-gfs2-to-use-kset_create.patch index 149ae06ca93f60..0643708c5d3e91 100644 --- a/driver/kset-convert-gfs2-to-use-kset_create.patch +++ b/driver/kset-convert-gfs2-to-use-kset_create.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - kobject_set_name(&gfs2_kset.kobj, "gfs2"); - gfs2_kset.kobj.parent = fs_kobj; - return kset_register(&gfs2_kset); -+ gfs2_kset = kset_create_and_register("gfs2", NULL, fs_kobj); ++ gfs2_kset = kset_create_and_add("gfs2", NULL, fs_kobj); + if (!gfs2_kset) + return -ENOMEM; + return 0; diff --git a/driver/kset-convert-kernel_subsys-to-use-kset_create.patch b/driver/kset-convert-kernel_subsys-to-use-kset_create.patch index 1f6eaaa506bd59..540b7e6f93195f 100644 --- a/driver/kset-convert-kernel_subsys-to-use-kset_create.patch +++ b/driver/kset-convert-kernel_subsys-to-use-kset_create.patch @@ -12,37 +12,35 @@ Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - fs/configfs/mount.c | 3 +-- - fs/debugfs/inode.c | 3 +-- + fs/configfs/mount.c | 2 +- + fs/debugfs/inode.c | 2 +- fs/dlm/lockspace.c | 2 +- - fs/gfs2/locking/dlm/sysfs.c | 2 +- + fs/gfs2/locking/dlm/sysfs.c | 3 +-- include/linux/kobject.h | 4 ++-- kernel/ksysfs.c | 42 ++++++++++++++++++++++++++++++------------ kernel/user.c | 4 ++-- security/inode.c | 2 +- - 8 files changed, 39 insertions(+), 23 deletions(-) + 8 files changed, 39 insertions(+), 22 deletions(-) --- a/fs/configfs/mount.c +++ b/fs/configfs/mount.c -@@ -140,8 +140,7 @@ static int __init configfs_init(void) +@@ -140,7 +140,7 @@ static int __init configfs_init(void) if (!configfs_dir_cachep) goto out; -- config_kobj = kobject_create_and_register("config", -- &kernel_subsys.kobj); -+ config_kobj = kobject_create_and_register("config", &kernel_kset->kobj); +- config_kobj = kobject_create_and_add("config", &kernel_subsys.kobj); ++ config_kobj = kobject_create_and_add("config", &kernel_kset->kobj); if (!config_kobj) { kmem_cache_destroy(configfs_dir_cachep); configfs_dir_cachep = NULL; --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c -@@ -432,8 +432,7 @@ static int __init debugfs_init(void) +@@ -432,7 +432,7 @@ static int __init debugfs_init(void) { int retval; -- debug_kobj = kobject_create_and_register("debug", -- &kernel_subsys.kobj); -+ debug_kobj = kobject_create_and_register("debug", &kernel_kset->kobj); +- debug_kobj = kobject_create_and_add("debug", &kernel_subsys.kobj); ++ debug_kobj = kobject_create_and_add("debug", &kernel_kset->kobj); if (!debug_kobj) return -EINVAL; @@ -52,25 +50,26 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> INIT_LIST_HEAD(&lslist); spin_lock_init(&lslist_lock); -- dlm_kset = kset_create_and_register("dlm", NULL, &kernel_subsys.kobj); -+ dlm_kset = kset_create_and_register("dlm", NULL, &kernel_kset->kobj); +- dlm_kset = kset_create_and_add("dlm", NULL, &kernel_subsys.kobj); ++ dlm_kset = kset_create_and_add("dlm", NULL, &kernel_kset->kobj); if (!dlm_kset) { printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); return -ENOMEM; --- a/fs/gfs2/locking/dlm/sysfs.c +++ b/fs/gfs2/locking/dlm/sysfs.c -@@ -220,7 +220,7 @@ void gdlm_kobject_release(struct gdlm_ls +@@ -219,8 +219,7 @@ void gdlm_kobject_release(struct gdlm_ls + int gdlm_sysfs_init(void) { - gdlm_kset = kset_create_and_register("lock_dlm", NULL, -- &kernel_subsys.kobj); -+ &kernel_kset->kobj); +- gdlm_kset = kset_create_and_add("lock_dlm", NULL, +- &kernel_subsys.kobj); ++ gdlm_kset = kset_create_and_add("lock_dlm", NULL, &kernel_kset->kobj); if (!gdlm_kset) { printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); return -ENOMEM; --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -188,8 +188,8 @@ struct kset _name##_subsys = { \ +@@ -194,8 +194,8 @@ struct kset _name##_subsys = { \ .uevent_ops =_uevent_ops, \ } @@ -105,7 +104,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + int error; - if (!error && notes_size > 0) { -+ kernel_kset = kset_create_and_register("kernel", NULL, NULL); ++ kernel_kset = kset_create_and_add("kernel", NULL, NULL); + if (!kernel_kset) { + error = -ENOMEM; + goto exit; @@ -162,12 +161,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/security/inode.c +++ b/security/inode.c -@@ -322,7 +322,7 @@ static int __init securityfs_init(void) +@@ -321,7 +321,7 @@ static int __init securityfs_init(void) + { int retval; - security_kobj = kobject_create_and_register("security", -- &kernel_subsys.kobj); -+ &kernel_kset->kobj); +- security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj); ++ security_kobj = kobject_create_and_add("security", &kernel_kset->kobj); if (!security_kobj) return -EINVAL; diff --git a/driver/kset-convert-pci-hotplug-to-use-kset_create_and_register.patch b/driver/kset-convert-pci-hotplug-to-use-kset_create_and_register.patch index fad0eed818e430..92ab027e47b158 100644 --- a/driver/kset-convert-pci-hotplug-to-use-kset_create_and_register.patch +++ b/driver/kset-convert-pci-hotplug-to-use-kset_create_and_register.patch @@ -77,8 +77,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - result = subsystem_register(&pci_hotplug_slots_subsys); - if (result) { - err("Register subsys with error %d\n", result); -+ pci_hotplug_slots_kset = kset_create_and_register("slots", NULL, -+ &pci_bus_type.subsys.kobj); ++ pci_hotplug_slots_kset = kset_create_and_add("slots", NULL, ++ &pci_bus_type.subsys.kobj); + if (!pci_hotplug_slots_kset) { + result = -ENOMEM; + err("Register subsys error\n"); diff --git a/driver/kset-convert-slub-to-use-kset_create.patch b/driver/kset-convert-slub-to-use-kset_create.patch index bb115a590bed3d..82ec1dcf7f3b80 100644 --- a/driver/kset-convert-slub-to-use-kset_create.patch +++ b/driver/kset-convert-slub-to-use-kset_create.patch @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - err = subsystem_register(&slab_subsys); - if (err) { -+ slab_kset = kset_create_and_register("slab", &slab_uevent_ops, NULL); ++ slab_kset = kset_create_and_add("slab", &slab_uevent_ops, NULL); + if (!slab_kset) { printk(KERN_ERR "Cannot register slab subsystem.\n"); return -ENOSYS; diff --git a/driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch b/driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch index 5923d078e0b8e0..2a0e8996abdf60 100644 --- a/driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch +++ b/driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch @@ -56,8 +56,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - bus->devices.kobj.parent = &bus->subsys.kobj; - retval = kset_register(&bus->devices); - if (retval) -+ bus->devices_kset = kset_create_and_register("devices", NULL, -+ &bus->subsys.kobj); ++ bus->devices_kset = kset_create_and_add("devices", NULL, ++ &bus->subsys.kobj); + if (!bus->devices_kset) { + retval = -ENOMEM; goto bus_devices_fail; diff --git a/driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch b/driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch index b0245661292ddf..bf3e9bb6554ce5 100644 --- a/driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch +++ b/driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch @@ -39,8 +39,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - bus->drivers.kobj.parent = &bus->subsys.kobj; - retval = kset_register(&bus->drivers); - if (retval) -+ bus->drivers_kset = kset_create_and_register("drivers", NULL, -+ &bus->subsys.kobj); ++ bus->drivers_kset = kset_create_and_add("drivers", NULL, ++ &bus->subsys.kobj); + if (!bus->drivers_kset) { + retval = -ENOMEM; goto bus_drivers_fail; diff --git a/driver/kset-convert-sys-devices-system-to-use-kset_create.patch b/driver/kset-convert-sys-devices-system-to-use-kset_create.patch index 30c0f2556e846f..c0d7b6ebd6c06a 100644 --- a/driver/kset-convert-sys-devices-system-to-use-kset_create.patch +++ b/driver/kset-convert-sys-devices-system-to-use-kset_create.patch @@ -10,8 +10,8 @@ Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/base/sys.c | 28 ++++++++++++---------------- - 1 file changed, 12 insertions(+), 16 deletions(-) + drivers/base/sys.c | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -78,14 +78,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct sys_device * sysdev; pr_debug("Resuming type '%s':\n", -@@ -457,8 +450,11 @@ int sysdev_resume(void) +@@ -457,8 +450,10 @@ int sysdev_resume(void) int __init system_bus_init(void) { - system_subsys.kobj.parent = &devices_kset->kobj; - return subsystem_register(&system_subsys); -+ system_kset = kset_create_and_register("system", NULL, -+ &devices_kset->kobj); ++ system_kset = kset_create_and_add("system", NULL, &devices_kset->kobj); + if (!system_kset) + return -ENOMEM; + return 0; diff --git a/driver/kset-convert-sys-devices-to-use-kset_create.patch b/driver/kset-convert-sys-devices-to-use-kset_create.patch index 025d3b8182106e..87dd9243f10fe2 100644 --- a/driver/kset-convert-sys-devices-to-use-kset_create.patch +++ b/driver/kset-convert-sys-devices-to-use-kset_create.patch @@ -13,10 +13,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/base/base.h | 2 +- - drivers/base/core.c | 17 +++++++++-------- + drivers/base/core.c | 16 ++++++++-------- drivers/base/power/shutdown.c | 2 +- drivers/base/sys.c | 4 +--- - 4 files changed, 12 insertions(+), 13 deletions(-) + 4 files changed, 11 insertions(+), 13 deletions(-) --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -54,19 +54,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> @@ -563,7 +560,7 @@ static struct kobject *virtual_device_pa if (!virtual_dir) - virtual_dir = kobject_create_and_register("virtual", -- &devices_subsys.kobj); -+ &devices_kset->kobj); + virtual_dir = kobject_create_and_add("virtual", +- &devices_subsys.kobj); ++ &devices_kset->kobj); return virtual_dir; } -@@ -1092,7 +1089,11 @@ struct device * device_find_child(struct +@@ -1097,7 +1094,10 @@ struct device * device_find_child(struct int __init devices_init(void) { - return subsystem_register(&devices_subsys); -+ devices_kset = kset_create_and_register("devices", &device_uevent_ops, -+ NULL); ++ devices_kset = kset_create_and_add("devices", &device_uevent_ops, NULL); + if (!devices_kset) + return -ENOMEM; + return 0; diff --git a/driver/kset-convert-sys-module-to-use-kset_create.patch b/driver/kset-convert-sys-module-to-use-kset_create.patch index 0ecc628ad60d69..da1304c55ad25f 100644 --- a/driver/kset-convert-sys-module-to-use-kset_create.patch +++ b/driver/kset-convert-sys-module-to-use-kset_create.patch @@ -13,8 +13,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/linux/module.h | 4 +++- kernel/module.c | 7 +++---- - kernel/params.c | 30 ++++++++++-------------------- - 3 files changed, 16 insertions(+), 25 deletions(-) + kernel/params.c | 29 +++++++++-------------------- + 3 files changed, 15 insertions(+), 25 deletions(-) --- a/include/linux/module.h +++ b/include/linux/module.h @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #if 0 #define DEBUGP printk #else -@@ -1224,7 +1222,8 @@ int mod_sysfs_init(struct module *mod) +@@ -1223,7 +1221,8 @@ int mod_sysfs_init(struct module *mod) err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name); if (err) goto out; @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mod->mkobj.mod = mod; kobject_init(&mod->mkobj.kobj); -@@ -2534,7 +2533,7 @@ void module_add_driver(struct module *mo +@@ -2532,7 +2531,7 @@ void module_add_driver(struct module *mo struct kobject *mkobj; /* Lookup built-in module entry in /sys/modules */ @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .sysfs_ops = &module_sysfs_ops, }; -@@ -707,13 +705,12 @@ static struct kobj_type module_ktype = { +@@ -707,13 +705,11 @@ static struct kobj_type module_ktype = { */ static int __init param_sysfs_init(void) { @@ -103,8 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - printk(KERN_WARNING "%s (%d): subsystem_register error: %d\n", - __FILE__, __LINE__, ret); - return ret; -+ module_kset = kset_create_and_register("module", &module_uevent_ops, -+ NULL); ++ module_kset = kset_create_and_add("module", &module_uevent_ops, NULL); + if (!module_kset) { + printk(KERN_WARNING "%s (%d): error creating kset\n", + __FILE__, __LINE__); @@ -112,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } module_sysfs_initialized = 1; -@@ -723,14 +720,7 @@ static int __init param_sysfs_init(void) +@@ -723,14 +719,7 @@ static int __init param_sysfs_init(void) } subsys_initcall(param_sysfs_init); diff --git a/driver/kset-convert-sys-power-to-use-kset_create.patch b/driver/kset-convert-sys-power-to-use-kset_create.patch index 73606db8ea4c2f..03a1991526274a 100644 --- a/driver/kset-convert-sys-power-to-use-kset_create.patch +++ b/driver/kset-convert-sys-power-to-use-kset_create.patch @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - if (!error) - error = sysfs_create_group(&power_subsys.kobj, &attr_group); - return error; -+ power_kset = kset_create_and_register("power", NULL, NULL); ++ power_kset = kset_create_and_add("power", NULL, NULL); + if (!power_kset) + return -ENOMEM; + return sysfs_create_group(&power_kset->kobj, &attr_group); @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -192,6 +192,8 @@ struct kset _name##_subsys = { \ +@@ -198,6 +198,8 @@ struct kset _name##_subsys = { \ extern struct kset *kernel_kset; /* The global /sys/hypervisor/ kobject for people to chain off of */ extern struct kobject *hypervisor_kobj; @@ -120,7 +120,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - if (!error) - error = sysfs_create_group(&power_subsys.kobj,&attr_group); - return error; -+ power_kset = kset_create_and_register("power", NULL, NULL); ++ power_kset = kset_create_and_add("power", NULL, NULL); + if (!power_kset) + return -ENOMEM; + return sysfs_create_group(&power_kset->kobj, &attr_group); diff --git a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch index 55d936600601f6..165068170937d9 100644 --- a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch +++ b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch @@ -45,9 +45,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct kmem_cache *s; int err; -- slab_kset = kset_create_and_register("slab", &slab_uevent_ops, NULL); -+ slab_kset = kset_create_and_register("slab", &slab_uevent_ops, -+ &kernel_kset->kobj); +- slab_kset = kset_create_and_add("slab", &slab_uevent_ops, NULL); ++ slab_kset = kset_create_and_add("slab", &slab_uevent_ops, ++ &kernel_kset->kobj); if (!slab_kset) { printk(KERN_ERR "Cannot register slab subsystem.\n"); return -ENOSYS; diff --git a/driver/kset-remove-decl_subsys_name.patch b/driver/kset-remove-decl_subsys_name.patch index 90beae187c5fd8..d64973ffa0e1ef 100644 --- a/driver/kset-remove-decl_subsys_name.patch +++ b/driver/kset-remove-decl_subsys_name.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -187,11 +187,6 @@ struct kset _name##_subsys = { \ +@@ -193,11 +193,6 @@ struct kset _name##_subsys = { \ .kobj = { .k_name = __stringify(_name) }, \ .uevent_ops =_uevent_ops, \ } |