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

driver core: Use sysfs_rename_link in device_rename

Browse Source 
Don't open code the renaming of symlinks in sysfs
instead use the new helper function sysfs_rename_link

Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric W. Biederman 2010-02-12 19:22:26 -08:00 committed by Greg Kroah-Hartman
parent 7cb32942d9
commit 2354dcc721
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/base/core.c
View File

@ -1578,22 +1578,16 @@ int device_rename(struct device *dev, char *new_name)
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) {
error = sysfs_create_link_nowarn(&dev->parent->kobj, error = sysfs_rename_link(&dev->parent->kobj,
&dev->kobj, &dev->kobj,
new_class_name); old_class_name,
if (error) new_class_name);
goto out;
sysfs_remove_link(&dev->parent->kobj, old_class_name);
} }
} }
#else #else
if (dev->class) { if (dev->class) {
error = sysfs_create_link_nowarn(&dev->class->p->class_subsys.kobj, error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,
&dev->kobj, dev_name(dev)); &dev->kobj, old_device_name, new_name);
if (error)
goto out;
sysfs_remove_link(&dev->class->p->class_subsys.kobj,
old_device_name);
} }
#endif #endif