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