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

[platform/kernel/linux-rpi.git] / drivers / infiniband / hw / irdma / hw.c

diff --git a/drivers/infiniband/hw/irdma/hw.c b/drivers/infiniband/hw/irdma/hw.c
index b4c657f..4b1b16e 100644 (file)
--- a/drivers/infiniband/hw/irdma/hw.c
+++ b/drivers/infiniband/hw/irdma/hw.c
@@ -550,7 +550,7 @@ static void irdma_destroy_irq(struct irdma_pci_f *rf,
        struct irdma_sc_dev *dev = &rf->sc_dev;
 
        dev->irq_ops->irdma_dis_irq(dev, msix_vec->idx);
-       irq_set_affinity_hint(msix_vec->irq, NULL);
+       irq_update_affinity_hint(msix_vec->irq, NULL);
        free_irq(msix_vec->irq, dev_id);
 }
 
@@ -1100,7 +1100,7 @@ irdma_cfg_ceq_vector(struct irdma_pci_f *rf, struct irdma_ceq *iwceq,
        }
        cpumask_clear(&msix_vec->mask);
        cpumask_set_cpu(msix_vec->cpu_affinity, &msix_vec->mask);
-       irq_set_affinity_hint(msix_vec->irq, &msix_vec->mask);
+       irq_update_affinity_hint(msix_vec->irq, &msix_vec->mask);
        if (status) {
                ibdev_dbg(&rf->iwdev->ibdev, "ERR: ceq irq config fail\n");
                return IRDMA_ERR_CFG;