2005-09-15 06:54:19

by Dmitry Torokhov

[permalink] [raw]
Subject:

Greg KH <[email protected]>,
Kay Sievers <[email protected]>,
Vojtech Pavlik <[email protected]>,
Hannes Reinecke <[email protected]>
Subject: [patch 04/28] Driver core: make parent class define subsystem
Content-Disposition: inline; filename=parent-class-defines-subsystem.patch
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Driver core: make parent class define subsystem for its children

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 <[email protected]>
---

drivers/base/class.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)

Index: work/drivers/base/class.c
===================================================================
--- work.orig/drivers/base/class.c
+++ work/drivers/base/class.c
@@ -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);