aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <[email protected]>2019-02-16 18:13:11 +0100
committerThomas Gleixner <[email protected]>2019-02-18 11:21:29 +0100
commita6a309edba13866b31dc4d8aebad3864a6d56ade (patch)
tree0319ce25b1cc9ecbec8a4832d16abd933297fefa
parent612b72862b4dd7f3f5e42651522daac6733b8ea6 (diff)
genirq/affinity: Remove the leftovers of the original set support
Now that the NVME driver is converted over to the calc_set() callback, the workarounds of the original set support can be removed. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Ming Lei <[email protected]> Acked-by: Marc Zyngier <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Jens Axboe <[email protected]> Cc: [email protected] Cc: Sagi Grimberg <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Keith Busch <[email protected]> Cc: Sumit Saxena <[email protected]> Cc: Kashyap Desai <[email protected]> Cc: Shivasharan Srikanteshwara <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
-rw-r--r--kernel/irq/affinity.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index d737dc60ab52..f18cd5aa33e8 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -264,20 +264,13 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
/*
* Simple invocations do not provide a calc_sets() callback. Install
- * the generic one. The check for affd->nr_sets is a temporary
- * workaround and will be removed after the NVME driver is converted
- * over.
+ * the generic one.
*/
- if (!affd->nr_sets && !affd->calc_sets)
+ if (!affd->calc_sets)
affd->calc_sets = default_calc_sets;
- /*
- * If the device driver provided a calc_sets() callback let it
- * recalculate the number of sets and their size. The check will go
- * away once the NVME driver is converted over.
- */
- if (affd->calc_sets)
- affd->calc_sets(affd, affvecs);
+ /* Recalculate the sets */
+ affd->calc_sets(affd, affvecs);
if (WARN_ON_ONCE(affd->nr_sets > IRQ_AFFINITY_MAX_SETS))
return NULL;
@@ -344,11 +337,6 @@ unsigned int irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec,
if (affd->calc_sets) {
set_vecs = maxvec - resv;
- } else if (affd->nr_sets) {
- unsigned int i;
-
- for (i = 0, set_vecs = 0; i < affd->nr_sets; i++)
- set_vecs += affd->set_size[i];
} else {
get_online_cpus();
set_vecs = cpumask_weight(cpu_possible_mask);