| Message ID | 20190602112117.31839-1-minwoo.im.dev@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | genirq/affinity: remove unused arg when building aff mask | expand |
On Sun, Jun 02, 2019 at 08:21:17PM +0900, Minwoo Im wrote: > 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. > > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: linux-block@vger.kernel.org > Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> > --- > kernel/irq/affinity.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c > index f18cd5aa33e8..4352b08ae48d 100644 > --- a/kernel/irq/affinity.c > +++ b/kernel/irq/affinity.c > @@ -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); > -- > 2.21.0 > Looks fine: Reviewed-by: Ming Lei <ming.lei@redhat.com> Thanks, Ming
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c index f18cd5aa33e8..4352b08ae48d 100644 --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -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);
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. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: linux-block@vger.kernel.org Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> --- kernel/irq/affinity.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)