diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-12 15:06:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 14:51:01 -0700 |
| commit | 27f20e5e4e60a7f28010eeb34399fe0cc9a1a235 (patch) | |
| tree | 3c1306f51f7b45428aa422c2d3ecb0c6d319baeb | |
| parent | d6b05b84edf590ff872de6310ec20d60b5b37dd2 (diff) | |
| download | linux-27f20e5e4e60a7f28010eeb34399fe0cc9a1a235.tar.gz linux-27f20e5e4e60a7f28010eeb34399fe0cc9a1a235.tar.bz2 linux-27f20e5e4e60a7f28010eeb34399fe0cc9a1a235.zip | |
Driver core: remove kset_set_kset_s
This macro is only used by the driver core and is held over from when we
had subsystems. It is not needed anymore.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/sys.c | 2 | ||||
| -rw-r--r-- | include/linux/kobject.h | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 18febe26caa1..7ad893167823 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -139,7 +139,7 @@ int sysdev_class_register(struct sysdev_class * cls) kobject_name(&cls->kset.kobj)); INIT_LIST_HEAD(&cls->drivers); cls->kset.kobj.parent = &system_subsys.kobj; - kset_set_kset_s(cls, system_subsys); + cls->kset.kobj.kset = &system_subsys; return kset_register(&cls->kset); } diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 0713799fde29..ee61ef27e799 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -227,20 +227,6 @@ extern struct kset hypervisor_subsys; #define kobj_set_kset_s(obj,subsys) \ (obj)->kobj.kset = &(subsys) -/** - * kset_set_kset_s(obj,subsys) - set kset for embedded kset. - * @obj: ptr to some object type. - * @subsys: a subsystem object (not a ptr). - * - * Can be used for any object type with an embedded ->kset. - * Sets the kset of @obj's embedded kobject (via its embedded - * kset) to @subsys.kset. This makes @obj a member of that - * kset. - */ - -#define kset_set_kset_s(obj,subsys) \ - (obj)->kset.kobj.kset = &(subsys) - extern void subsystem_init(struct kset *); extern int __must_check subsystem_register(struct kset *); extern void subsystem_unregister(struct kset *); |