kobject: convert kernel_kset to be a kobject

[firefly-linux-kernel-4.4.55.git] / include / linux / kobject.h

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 29841bb5badb248adebd74069fe05859da1ce85d..0930efdcc0948d4f4ae9b436cb10fa91ab8920ee 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -198,20 +198,14 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
 #define set_kset_name(str)     .kset = { .kobj = { .k_name = str } }
 
 
-#define decl_subsys(_name,_uevent_ops) \
-struct kset _name##_subsys = { \
-       .kobj = { .k_name = __stringify(_name) }, \
-       .uevent_ops =_uevent_ops, \
-}
-
-/* The global /sys/kernel/ kset for people to chain off of */
-extern struct kset *kernel_kset;
+/* The global /sys/kernel/ kobject for people to chain off of */
+extern struct kobject *kernel_kobj;
 /* The global /sys/hypervisor/ kobject for people to chain off of */
 extern struct kobject *hypervisor_kobj;
 /* The global /sys/power/ kset for people to chain off of */
 extern struct kset *power_kset;
-/* The global /sys/firmware/ kset for people to chain off of */
-extern struct kset *firmware_kset;
+/* The global /sys/firmware/ kobject for people to chain off of */
+extern struct kobject *firmware_kobj;
 
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);