Merge branch 'linus' into irq/core, to fix conflict

[platform/kernel/linux-rpi.git] / drivers / net / ethernet / intel / i40e / i40e_main.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 61afc22..2a3d8ae 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3915,10 +3915,10 @@ static int i40e_vsi_request_irq_msix(struct i40e_vsi *vsi, char *basename)
                 *
                 * get_cpu_mask returns a static constant mask with
                 * a permanent lifetime so it's ok to pass to
-                * irq_set_affinity_hint without making a copy.
+                * irq_update_affinity_hint without making a copy.
                 */
                cpu = cpumask_local_spread(q_vector->v_idx, -1);
-               irq_set_affinity_hint(irq_num, get_cpu_mask(cpu));
+               irq_update_affinity_hint(irq_num, get_cpu_mask(cpu));
        }
 
        vsi->irqs_ready = true;
@@ -3929,7 +3929,7 @@ free_queue_irqs:
                vector--;
                irq_num = pf->msix_entries[base + vector].vector;
                irq_set_affinity_notifier(irq_num, NULL);
-               irq_set_affinity_hint(irq_num, NULL);
+               irq_update_affinity_hint(irq_num, NULL);
                free_irq(irq_num, &vsi->q_vectors[vector]);
        }
        return err;
@@ -4750,7 +4750,7 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi)
                        /* clear the affinity notifier in the IRQ descriptor */
                        irq_set_affinity_notifier(irq_num, NULL);
                        /* remove our suggested affinity mask for this IRQ */
-                       irq_set_affinity_hint(irq_num, NULL);
+                       irq_update_affinity_hint(irq_num, NULL);
                        synchronize_irq(irq_num);
                        free_irq(irq_num, vsi->q_vectors[i]);