iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] Driver core: add proper symlinks for devices

Browse Source 
We need to create the "compatible" symlinks that class_devices used to
create when they were in the class directories so that userspace does
not know anything changed at all.

Yeah, we have a lot of symlinks now, but we should be able to get rid of
them in a year or two... (wishful thinking...)

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2006-06-20 13:59:20 -07:00
parent b9d9c82b4d
commit e9a7d305fa
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/core.c
View File

@ -273,6 +273,7 @@ void device_initialize(struct device *dev)
int device_add(struct device *dev) int device_add(struct device *dev)
{ {
struct device *parent = NULL; struct device *parent = NULL;
char *class_name = NULL;
int error = -EINVAL; int error = -EINVAL;
dev = get_device(dev); dev = get_device(dev);
@ -324,6 +325,10 @@ int device_add(struct device *dev)
"subsystem"); "subsystem");
sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj, sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
dev->bus_id); dev->bus_id);
sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
class_name = make_class_name(dev->class->name, &dev->kobj);
sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
} }
if ((error = device_pm_add(dev))) if ((error = device_pm_add(dev)))
@ -339,6 +344,7 @@ int device_add(struct device *dev)
if (platform_notify) if (platform_notify)
platform_notify(dev); platform_notify(dev);
Done: Done:
kfree(class_name);
put_device(dev); put_device(dev);
return error; return error;
BusError: BusError:
@ -420,6 +426,7 @@ void put_device(struct device * dev)
void device_del(struct device * dev) void device_del(struct device * dev)
{ {
struct device * parent = dev->parent; struct device * parent = dev->parent;
char *class_name = NULL;
if (parent) if (parent)
klist_del(&dev->knode_parent); klist_del(&dev->knode_parent);
@ -428,6 +435,10 @@ void device_del(struct device * dev)
if (dev->class) { if (dev->class) {
sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->kobj, "subsystem");
sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id); sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
class_name = make_class_name(dev->class->name, &dev->kobj);
sysfs_remove_link(&dev->kobj, "device");
sysfs_remove_link(&dev->parent->kobj, class_name);
kfree(class_name);
} }
device_remove_file(dev, &dev->uevent_attr); device_remove_file(dev, &dev->uevent_attr);