aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/sys.c2
-rw-r--r--include/linux/kobject.h14
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)
139 kobject_name(&cls->kset.kobj)); 139 kobject_name(&cls->kset.kobj));
140 INIT_LIST_HEAD(&cls->drivers); 140 INIT_LIST_HEAD(&cls->drivers);
141 cls->kset.kobj.parent = &system_subsys.kobj; 141 cls->kset.kobj.parent = &system_subsys.kobj;
142 kset_set_kset_s(cls, system_subsys); 142 cls->kset.kobj.kset = &system_subsys;
143 return kset_register(&cls->kset); 143 return kset_register(&cls->kset);
144} 144}
145 145
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;
227#define kobj_set_kset_s(obj,subsys) \ 227#define kobj_set_kset_s(obj,subsys) \
228 (obj)->kobj.kset = &(subsys) 228 (obj)->kobj.kset = &(subsys)
229 229
230/**
231 * kset_set_kset_s(obj,subsys) - set kset for embedded kset.
232 * @obj: ptr to some object type.
233 * @subsys: a subsystem object (not a ptr).
234 *
235 * Can be used for any object type with an embedded ->kset.
236 * Sets the kset of @obj's embedded kobject (via its embedded
237 * kset) to @subsys.kset. This makes @obj a member of that
238 * kset.
239 */
240
241#define kset_set_kset_s(obj,subsys) \
242 (obj)->kset.kobj.kset = &(subsys)
243
244extern void subsystem_init(struct kset *); 230extern void subsystem_init(struct kset *);
245extern int __must_check subsystem_register(struct kset *); 231extern int __must_check subsystem_register(struct kset *);
246extern void subsystem_unregister(struct kset *); 232extern void subsystem_unregister(struct kset *);