genirq/affinity: remove unused arg when building aff mask
Subsystems (2)
PATCH 1/1 genirq/affinity: remove unused arg when building aff mask
When building affinity masks, the struct irq_affinity *affd is not needed because irq_create_affinity_masks() has already given a cursored current vector after pre_vectors via "curvec".
This patch removes unused argument for irq_build_affinity_masks() and __irq_build_affinity_masks(). No functions changes are included.
--- kernel/irq/affinity.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
kernel/irq/affinity.c +5 -7
@@ -94,8 +94,7 @@ static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,return nodes; } -static int __irq_build_affinity_masks(const struct irq_affinity *affd, - unsigned int startvec, +static int __irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs, unsigned int firstvec, cpumask_var_t *node_to_cpumask,
@@ -171,8 +170,7 @@ static int __irq_build_affinity_masks(const struct irq_affinity *affd,* 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks (const struct irq_affinity *affd, -unsigned int startvec,unsigned int numvecs, +static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs,unsigned int firstvec,struct irq_affinity_desc *masks) {
@@ -197,7 +195,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - nr_present =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_present =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, cpu_present_mask, nmsk, masks);
@@ -212,7 +210,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,else curvec = firstvec + nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - nr_others =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_others =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, npresmsk, nmsk, masks);put_online_cpus ();
@@ -295,7 +293,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (affd, curvec, this_vecs, + ret =irq_build_affinity_masks (curvec, this_vecs, curvec, masks);if (ret) {kfree (masks);
Signature · 1 line
2.21.0
Quoted 69 lines · Minwoo Im
When building affinity masks, the struct
irq_affinity*affd is not needed becauseirq_create_affinity_masks()has already given a cursored current vector afterpre_vectorsvia "curvec".This patch removes unused argument for
irq_build_affinity_masks()and__irq_build_affinity_masks(). No functions changes are included.Cc Thomas Gleixner <[email protected]>Cc Ming Lei <[email protected]>Signed-off-by Minwoo Im <[email protected]>--- kernel/irq/affinity.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)kernel/irq/affinity.c +5
-7@@ -94,8 +94,7 @@ static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,return nodes; } -static int __irq_build_affinity_masks(const struct irq_affinity *affd, - unsigned int startvec, +static int __irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs, unsigned int firstvec, cpumask_var_t *node_to_cpumask,@@ -171,8 +170,7 @@ static int __irq_build_affinity_masks(const struct irq_affinity *affd,* 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks (const struct irq_affinity *affd, -unsigned int startvec,unsigned int numvecs, +static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs,unsigned int firstvec,struct irq_affinity_desc *masks) {@@ -197,7 +195,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - nr_present =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_present =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, cpu_present_mask, nmsk, masks);@@ -212,7 +210,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,else curvec = firstvec + nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - nr_others =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_others =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, npresmsk, nmsk, masks);put_online_cpus ();@@ -295,7 +293,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (affd, curvec, this_vecs, + ret =irq_build_affinity_masks (curvec, this_vecs, curvec, masks);if (ret) {kfree (masks);Signature · 1 line
2.21.0
Looks fine:
Thanks,
Ming
tip-bot for Minwoo Im
merge bot[tip:irq/core] genirq/affinity: Remove unused argument from [__]irq_build_affinity_masks()
In reply to Minwoo Imgenirq/affinity: Remove unused argument from [__]irq_build_affinity_masks()
Commit-ID: 0e51833042fccfe882ef3e85a346252550d26c22 Gitweb: https://git.kernel.org/tip/0e51833042fccfe882ef3e85a346252550d26c22 Author: Minwoo Im <[email protected]> AuthorDate: Sun, 2 Jun 2019 20:21:17 +0900 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 12 Jun 2019 10:52:45 +0200
genirq/affinity: Remove unused argument from [__]irq_build_affinity_masks()
The *affd argument is neither used in irq_build_affinity_masks() nor __irq_build_affinity_masks(). Remove it.
--- kernel/irq/affinity.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
kernel/irq/affinity.c +5 -7
@@ -94,8 +94,7 @@ static int get_nodes_in_cpumask(cpumask_var_t *node_to_cpumask,return nodes; } -static int __irq_build_affinity_masks(const struct irq_affinity *affd, - unsigned int startvec, +static int __irq_build_affinity_masks(unsigned int startvec, unsigned int numvecs, unsigned int firstvec, cpumask_var_t *node_to_cpumask,
@@ -171,8 +170,7 @@ static int __irq_build_affinity_masks(const struct irq_affinity *affd,* 1) spread present CPU on these vectors * 2) spread other possible CPUs on these vectors */ -static int irq_build_affinity_masks (const struct irq_affinity *affd, -unsigned int startvec,unsigned int numvecs, +static int irq_build_affinity_masks (unsigned int startvec,unsigned int numvecs,unsigned int firstvec,struct irq_affinity_desc *masks) {
@@ -197,7 +195,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,build_node_to_cpumask (node_to_cpumask);/* Spread on present CPUs starting from affd->pre_vectors */ - nr_present =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_present =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, cpu_present_mask, nmsk, masks);
@@ -212,7 +210,7 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,else curvec = firstvec + nr_present;cpumask_andnot (npresmsk, cpu_possible_mask, cpu_present_mask); - nr_others =__irq_build_affinity_masks (affd, curvec, numvecs, + nr_others =__irq_build_affinity_masks (curvec, numvecs, firstvec, node_to_cpumask, npresmsk, nmsk, masks);put_online_cpus ();
@@ -295,7 +293,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)unsigned int this_vecs = affd->set_size[i];int ret; - ret =irq_build_affinity_masks (affd, curvec, this_vecs, + ret =irq_build_affinity_masks (curvec, this_vecs, curvec, masks);if (ret) {kfree (masks);