ionic: ionic_intr_free parameter change
authorShannon Nelson <snelson@pensando.io>
Tue, 12 May 2020 00:59:33 +0000 (17:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 May 2020 19:19:30 +0000 (12:19 -0700)
Change the ionic_intr_free parameter from struct ionic_lif to
struct ionic since that's what it actually cares about.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_lif.c

index 5f63c611d1fda8b12c37ddc481e58e5fe896f189..9bf1424466456010fd438fa983cbbfb0f2a6b578 100644 (file)
@@ -197,10 +197,10 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
        return 0;
 }
 
-static void ionic_intr_free(struct ionic_lif *lif, int index)
+static void ionic_intr_free(struct ionic *ionic, int index)
 {
-       if (index != INTR_INDEX_NOT_ASSIGNED && index < lif->ionic->nintrs)
-               clear_bit(index, lif->ionic->intrs);
+       if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
+               clear_bit(index, ionic->intrs);
 }
 
 static int ionic_qcq_enable(struct ionic_qcq *qcq)
@@ -310,7 +310,7 @@ static void ionic_qcq_free(struct ionic_lif *lif, struct ionic_qcq *qcq)
                irq_set_affinity_hint(qcq->intr.vector, NULL);
                devm_free_irq(dev, qcq->intr.vector, &qcq->napi);
                qcq->intr.vector = 0;
-               ionic_intr_free(lif, qcq->intr.index);
+               ionic_intr_free(lif->ionic, qcq->intr.index);
        }
 
        devm_kfree(dev, qcq->cq.info);
@@ -356,7 +356,7 @@ static void ionic_link_qcq_interrupts(struct ionic_qcq *src_qcq,
                                      struct ionic_qcq *n_qcq)
 {
        if (WARN_ON(n_qcq->flags & IONIC_QCQ_F_INTR)) {
-               ionic_intr_free(n_qcq->cq.lif, n_qcq->intr.index);
+               ionic_intr_free(n_qcq->cq.lif->ionic, n_qcq->intr.index);
                n_qcq->flags &= ~IONIC_QCQ_F_INTR;
        }
 
@@ -508,7 +508,7 @@ err_out_free_irq:
                devm_free_irq(dev, new->intr.vector, &new->napi);
 err_out_free_intr:
        if (flags & IONIC_QCQ_F_INTR)
-               ionic_intr_free(lif, new->intr.index);
+               ionic_intr_free(lif->ionic, new->intr.index);
 err_out:
        dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err);
        return err;