Previous commit
("x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak")

removed superfluous kernfs_get() calls in rdtgroup_ctrl_remove() and
rdtgroup_rmdir_ctrl(). That change resulted in an unused function
parameter to these two functions.

Clean up the unused function parameter in rdtgroup_ctrl_remove(),
rdtgroup_rmdir_mon() and their callers rdtgroup_rmdir_ctrl() and
rdtgroup_rmdir().

Signed-off-by: Xiaochen Shen <xiaochen.s...@intel.com>
Reviewed-by: Reinette Chatre <reinette.cha...@intel.com>
---
 arch/x86/kernel/cpu/resctrl/rdtgroup.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c 
b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 6f4ca4bea625..b1bba837bd11 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -3018,8 +3018,7 @@ static int rdtgroup_mkdir(struct kernfs_node *parent_kn, 
const char *name,
        return -EPERM;
 }
 
-static int rdtgroup_rmdir_mon(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
-                             cpumask_var_t tmpmask)
+static int rdtgroup_rmdir_mon(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask)
 {
        struct rdtgroup *prdtgrp = rdtgrp->mon.parent;
        int cpu;
@@ -3051,8 +3050,7 @@ static int rdtgroup_rmdir_mon(struct kernfs_node *kn, 
struct rdtgroup *rdtgrp,
        return 0;
 }
 
-static int rdtgroup_ctrl_remove(struct kernfs_node *kn,
-                               struct rdtgroup *rdtgrp)
+static int rdtgroup_ctrl_remove(struct rdtgroup *rdtgrp)
 {
        rdtgrp->flags = RDT_DELETED;
        list_del(&rdtgrp->rdtgroup_list);
@@ -3061,8 +3059,7 @@ static int rdtgroup_ctrl_remove(struct kernfs_node *kn,
        return 0;
 }
 
-static int rdtgroup_rmdir_ctrl(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
-                              cpumask_var_t tmpmask)
+static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask)
 {
        int cpu;
 
@@ -3089,7 +3086,7 @@ static int rdtgroup_rmdir_ctrl(struct kernfs_node *kn, 
struct rdtgroup *rdtgrp,
        closid_free(rdtgrp->closid);
        free_rmid(rdtgrp->mon.rmid);
 
-       rdtgroup_ctrl_remove(kn, rdtgrp);
+       rdtgroup_ctrl_remove(rdtgrp);
 
        /*
         * Free all the child monitor group rmids.
@@ -3126,13 +3123,13 @@ static int rdtgroup_rmdir(struct kernfs_node *kn)
            rdtgrp != &rdtgroup_default) {
                if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP ||
                    rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED) {
-                       ret = rdtgroup_ctrl_remove(kn, rdtgrp);
+                       ret = rdtgroup_ctrl_remove(rdtgrp);
                } else {
-                       ret = rdtgroup_rmdir_ctrl(kn, rdtgrp, tmpmask);
+                       ret = rdtgroup_rmdir_ctrl(rdtgrp, tmpmask);
                }
        } else if (rdtgrp->type == RDTMON_GROUP &&
                 is_mon_groups(parent_kn, kn->name)) {
-               ret = rdtgroup_rmdir_mon(kn, rdtgrp, tmpmask);
+               ret = rdtgroup_rmdir_mon(rdtgrp, tmpmask);
        } else {
                ret = -EPERM;
        }
-- 
1.8.3.1

Reply via email to