Commit 36ac2c50 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller

ionic: ionic_intr_free parameter change

Change the ionic_intr_free parameter from struct ionic_lif to
struct ionic since that's what it actually cares about.
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c784311
...@@ -197,10 +197,10 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr) ...@@ -197,10 +197,10 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
return 0; 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) if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
clear_bit(index, lif->ionic->intrs); clear_bit(index, ionic->intrs);
} }
static int ionic_qcq_enable(struct ionic_qcq *qcq) 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) ...@@ -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); irq_set_affinity_hint(qcq->intr.vector, NULL);
devm_free_irq(dev, qcq->intr.vector, &qcq->napi); devm_free_irq(dev, qcq->intr.vector, &qcq->napi);
qcq->intr.vector = 0; 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); devm_kfree(dev, qcq->cq.info);
...@@ -356,7 +356,7 @@ static void ionic_link_qcq_interrupts(struct ionic_qcq *src_qcq, ...@@ -356,7 +356,7 @@ static void ionic_link_qcq_interrupts(struct ionic_qcq *src_qcq,
struct ionic_qcq *n_qcq) struct ionic_qcq *n_qcq)
{ {
if (WARN_ON(n_qcq->flags & IONIC_QCQ_F_INTR)) { 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; n_qcq->flags &= ~IONIC_QCQ_F_INTR;
} }
...@@ -508,7 +508,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, ...@@ -508,7 +508,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
devm_free_irq(dev, new->intr.vector, &new->napi); devm_free_irq(dev, new->intr.vector, &new->napi);
err_out_free_intr: err_out_free_intr:
if (flags & IONIC_QCQ_F_INTR) if (flags & IONIC_QCQ_F_INTR)
ionic_intr_free(lif, new->intr.index); ionic_intr_free(lif->ionic, new->intr.index);
err_out: err_out:
dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err); dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment