Merge branch 'linus' into cpus4096

1 files changed, 1 insertions, 4 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index c1a7efb310bf..aedaeba82ae5 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -459,11 +459,8 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
         int ret;
 
         ret = __sysfs_add_one(acxt, sd);
-        if (ret == -EEXIST) {
-                printk(KERN_WARNING "sysfs: duplicate filename '%s' "
+        WARN(ret == -EEXIST, KERN_WARNING "sysfs: duplicate filename '%s' "
                        "can not be created\n", sd->s_name);
-                WARN_ON(1);
-        }
         return ret;
 }