renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

CONFIG_SYSFS_DEPRECATED - device symlinks

Browse Source 
Turn off device symlinks CONFIG_SYSFS_DEPRECATED is enabled.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2006-09-14 11:23:28 +02:00 committed by Greg Kroah-Hartman
parent b9cafc7d5b
commit 99ef3ef8d5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/base/core.c
View File

@ -513,11 +513,13 @@ int device_add(struct device *dev)
if (dev->kobj.parent != &dev->class->subsys.kset.kobj) if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
sysfs_create_link(&dev->class->subsys.kset.kobj, sysfs_create_link(&dev->class->subsys.kset.kobj,
&dev->kobj, dev->bus_id); &dev->kobj, dev->bus_id);
#ifdef CONFIG_SYSFS_DEPRECATED
if (parent) { if (parent) {
sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device"); sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
class_name = make_class_name(dev->class->name, &dev->kobj); class_name = make_class_name(dev->class->name, &dev->kobj);
sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name); sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
} }
#endif
} }
if ((error = device_add_attrs(dev))) if ((error = device_add_attrs(dev)))
@ -639,7 +641,6 @@ 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;
struct class_interface *class_intf; struct class_interface *class_intf;
if (parent) if (parent)
@ -655,12 +656,16 @@ void device_del(struct device * dev)
if (dev->kobj.parent != &dev->class->subsys.kset.kobj) if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
sysfs_remove_link(&dev->class->subsys.kset.kobj, sysfs_remove_link(&dev->class->subsys.kset.kobj,
dev->bus_id); dev->bus_id);
class_name = make_class_name(dev->class->name, &dev->kobj); #ifdef CONFIG_SYSFS_DEPRECATED
if (parent) { if (parent) {
sysfs_remove_link(&dev->kobj, "device"); char *class_name = make_class_name(dev->class->name,
&dev->kobj);
sysfs_remove_link(&dev->parent->kobj, class_name); sysfs_remove_link(&dev->parent->kobj, class_name);
kfree(class_name);
sysfs_remove_link(&dev->kobj, "device");
} }
kfree(class_name); #endif
down(&dev->class->sem); down(&dev->class->sem);
/* notify any interfaces that the device is now gone */ /* notify any interfaces that the device is now gone */
list_for_each_entry(class_intf, &dev->class->interfaces, node) list_for_each_entry(class_intf, &dev->class->interfaces, node)
@ -869,8 +874,10 @@ int device_rename(struct device *dev, char *new_name)
pr_debug("DEVICE: renaming '%s' to '%s'\n", dev->bus_id, new_name); pr_debug("DEVICE: renaming '%s' to '%s'\n", dev->bus_id, new_name);
#ifdef CONFIG_SYSFS_DEPRECATED
if ((dev->class) && (dev->parent)) if ((dev->class) && (dev->parent))
old_class_name = make_class_name(dev->class->name, &dev->kobj); old_class_name = make_class_name(dev->class->name, &dev->kobj);
#endif
if (dev->class) { if (dev->class) {
old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL); old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
@ -885,6 +892,7 @@ int device_rename(struct device *dev, char *new_name)
error = kobject_rename(&dev->kobj, new_name); error = kobject_rename(&dev->kobj, new_name);
#ifdef CONFIG_SYSFS_DEPRECATED
if (old_class_name) { if (old_class_name) {
new_class_name = make_class_name(dev->class->name, &dev->kobj); new_class_name = make_class_name(dev->class->name, &dev->kobj);
if (new_class_name) { if (new_class_name) {
@ -893,6 +901,8 @@ int device_rename(struct device *dev, char *new_name)
sysfs_remove_link(&dev->parent->kobj, old_class_name); sysfs_remove_link(&dev->parent->kobj, old_class_name);
} }
} }
#endif
if (dev->class) { if (dev->class) {
sysfs_remove_link(&dev->class->subsys.kset.kobj, sysfs_remove_link(&dev->class->subsys.kset.kobj,
old_symlink_name); old_symlink_name);