From: Dmitry Torokhov When there is a hierarchy of classes make parent class define subsystem as reported in hotplug notifications. The full class path is reported in a new CLASS environment variable. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton --- drivers/base/class.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff -puN drivers/base/class.c~driver-core-make-parent-class-define-subsystem drivers/base/class.c --- devel/drivers/base/class.c~driver-core-make-parent-class-define-subsystem 2005-09-15 20:54:26.000000000 -0700 +++ devel-akpm/drivers/base/class.c 2005-09-15 20:54:26.000000000 -0700 @@ -337,25 +337,35 @@ static int class_hotplug_filter(struct k static const char *class_hotplug_name(struct kset *kset, struct kobject *kobj) { struct class_device *class_dev = to_class_dev(kobj); + struct class *class = class_dev->class; - return class_dev->class->name; + while (class->parent) + class = class->parent; + + return class->name; } static int class_hotplug(struct kset *kset, struct kobject *kobj, char **envp, int num_envp, char *buffer, int buffer_size) { struct class_device *class_dev = to_class_dev(kobj); + const char *path; int i = 0; int length = 0; int retval = 0; pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id); + path = kobject_get_path(&class_dev->class->subsys.kset.kobj, GFP_KERNEL); + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, + &length, "CLASS=%s", path); + kfree(path); + if (class_dev->dev) { /* add physical device, backing this device */ struct device *dev = class_dev->dev; - char *path = kobject_get_path(&dev->kobj, GFP_KERNEL); + path = kobject_get_path(&dev->kobj, GFP_KERNEL); add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "PHYSDEVPATH=%s", path); kfree(path); _