1 files changed, 6 insertions, 6 deletions

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 21102158ca33..2dae55c4f7dc 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -26,7 +26,7 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
 
         if (grp->attrs)
                 for (attr = grp->attrs; *attr; attr++)
-                        sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);
+                        sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
         if (grp->bin_attrs)
                 for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++)
                         sysfs_remove_bin_file(kobj, *bin_attr);
@@ -49,8 +49,8 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
                          * re-adding (if required) the file.
                          */
                         if (update)
-                                sysfs_hash_and_remove(dir_sd, NULL,
-                                                      (*attr)->name);
+                                sysfs_hash_and_remove(dir_sd, (*attr)->name,
+                                                      NULL);
                         if (grp->is_visible) {
                                 mode = grp->is_visible(kobj, *attr, i);
                                 if (!mode)
@@ -270,7 +270,7 @@ int sysfs_merge_group(struct kobject *kobj,
                 error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);
         if (error) {
                 while (--i >= 0)
-                        sysfs_hash_and_remove(dir_sd, NULL, (*--attr)->name);
+                        sysfs_hash_and_remove(dir_sd, (*--attr)->name, NULL);
         }
         sysfs_put(dir_sd);
 
@@ -292,7 +292,7 @@ void sysfs_unmerge_group(struct kobject *kobj,
         dir_sd = sysfs_get_dirent(kobj->sd, grp->name);
         if (dir_sd) {
                 for (attr = grp->attrs; *attr; ++attr)
-                        sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);
+                        sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
                 sysfs_put(dir_sd);
         }
 }
@@ -335,7 +335,7 @@ void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 
         dir_sd = sysfs_get_dirent(kobj->sd, group_name);
         if (dir_sd) {
-                sysfs_hash_and_remove(dir_sd, NULL, link_name);
+                sysfs_hash_and_remove(dir_sd, link_name, NULL);
                 sysfs_put(dir_sd);
         }
 }