powerpc: Remove redundant sysfs_remove_file calls for cache info

When removing a directory, the sysfs core takes care of removing files
in the directory (see sysfs_remove_dir()).  So when we are about to
delete a kobject (and thus cause its sysfs directory to be removed),
we don't have to explicitly remove the files attached to it, although
it's harmless to do so.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 56d172d16e56..12058db70095 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -641,16 +641,9 @@ static void remove_cache_info(struct sys_device *sysdev)
         int cpu = sysdev->id;
 
         cache_desc = per_cpu(cache_desc, cpu);
-        if (cache_desc != NULL) {
-                sysfs_remove_file(&cache_desc->kobj, &cache_size_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_line_size_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_type_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_level_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_nr_sets_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_assoc_attr.attr);
-
+        if (cache_desc != NULL)
                 kobject_put(&cache_desc->kobj);
-        }
+
         cache_toplevel = per_cpu(cache_toplevel, cpu);
         if (cache_toplevel != NULL)
                 kobject_put(cache_toplevel);