genirq: Use cpumask_intersects()

Replace `cpumask_any_and(a, b) >= nr_cpu_ids` and `cpumask_any_and(a, b) <
nr_cpu_ids` with the more readable `!cpumask_intersects(a, b)` and
`cpumask_intersects(a, b)`

Signed-off-by: Costa Shulyupin <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/all/[email protected]

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index dc94e0bf2c9408e2aefc2094528b47f8f8372ad7..271e9139de77f5348539c95e3463c4fb7585df10 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -198,7 +198,7 @@ __irq_startup_managed(struct irq_desc *desc, const struct cpumask *aff,
 
        irqd_clr_managed_shutdown(d);
 
-       if (cpumask_any_and(aff, cpu_online_mask) >= nr_cpu_ids) {
+       if (!cpumask_intersects(aff, cpu_online_mask)) {
                /*
                 * Catch code which fiddles with enable_irq() on a managed
                 * and potentially shutdown IRQ. Chained interrupt

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 61ca924ef4b4c2d5fff88ba5b85b8993b69698c0..eb150afd671f6de72624d1e686f6226e2b8aee08 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -26,7 +26,7 @@ bool irq_fixup_move_pending(struct irq_desc *desc, bool force_clear)
         * The outgoing CPU might be the last online target in a pending
         * interrupt move. If that's the case clear the pending move bit.
         */
-       if (cpumask_any_and(desc->pending_mask, cpu_online_mask) >= nr_cpu_ids) {
+       if (!cpumask_intersects(desc->pending_mask, cpu_online_mask)) {
                irqd_clr_move_pending(data);
                return false;
        }
@@ -74,7 +74,7 @@ void irq_move_masked_irq(struct irq_data *idata)
         * For correct operation this depends on the caller
         * masking the irqs.
         */
-       if (cpumask_any_and(desc->pending_mask, cpu_online_mask) < nr_cpu_ids) {
+       if (cpumask_intersects(desc->pending_mask, cpu_online_mask)) {
                int ret;
 
                ret = irq_do_set_affinity(data, desc->pending_mask, false);