From 96969abbdc6ac504994d12a5a6dc50205319e6f1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Oct 2007 10:11:44 -0600 Subject: [PATCH] --- yaml --- r: 75731 b: refs/heads/master c: 12d03da7c19366268bdbc9fb0cd08d719c0cc283 h: refs/heads/master i: 75729: 2d6ec2ba52bb99df4fe88ea55e9eae4dd789b0c8 75727: a2c308ea8f8193403ebbc9108d367bd87f5ad3b2 v: v3 --- [refs] | 2 +- trunk/include/linux/kobject.h | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 11938852b90a..01b658cde876 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3514faca19a6fdc209734431c509631ea92b094e +refs/heads/master: 12d03da7c19366268bdbc9fb0cd08d719c0cc283 diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h index 5031565ab30d..0b97b3a53917 100644 --- a/trunk/include/linux/kobject.h +++ b/trunk/include/linux/kobject.h @@ -202,24 +202,6 @@ extern struct kset kernel_subsys; /* The global /sys/hypervisor/ subsystem */ extern struct kset hypervisor_subsys; -/* - * Helpers for setting the kset of registered objects. - * Often, a registered object belongs to a kset embedded in a - * subsystem. These do no magic, just make the resulting code - * easier to follow. - */ - -/** - * kobj_set_kset_s(obj,subsys) - set kset for embedded kobject. - * @obj: ptr to some object type. - * @subsys: a subsystem object (not a ptr). - * - * Can be used for any object type with an embedded ->kobj. - */ - -#define kobj_set_kset_s(obj,subsys) \ - (obj)->kobj.kset = &(subsys) - extern int __must_check subsystem_register(struct kset *); extern void subsystem_unregister(struct kset *);