driver core: Suppress sysfs warnings for device_rename().

driver core: Suppress sysfs warnings for device_rename().

Renaming network devices to an already existing name is not
something we want sysfs to print a scary warning for, since the
callers can deal with this correctly. So let's introduce
sysfs_create_link_nowarn() which gets rid of the common warning.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c05b1159023e..7d5c63c81a59 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1345,8 +1345,9 @@ 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(&dev->parent->kobj,
-                                                  &dev->kobj, 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);
@@ -1354,8 +1355,8 @@ int device_rename(struct device *dev, char *new_name)
         }
 #else
         if (dev->class) {
-                error = sysfs_create_link(&dev->class->p->class_subsys.kobj,
-                                          &dev->kobj, dev->bus_id);
+                error = sysfs_create_link_nowarn(&dev->class->p->class_subsys.kobj,
+                                                 &dev->kobj, dev->bus_id);
                 if (error)
                         goto out;
                 sysfs_remove_link(&dev->class->p->class_subsys.kobj,