Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e77647a authored by Shannon Nelson's avatar Shannon Nelson Committed by Greg Kroah-Hartman
Browse files

ionic: ionic_intr_free parameter change 



[ Upstream commit 36ac2c50924892a28e17ff463e354fec7650ee19 ]

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>
Stable-dep-of: abfb2a58a537 ("ionic: remove WARN_ON to prevent panic_on_warn")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f0dc38bd

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+6 −6
Original line number Diff line number Diff line
@@ -167,10 +167,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)
@@ -289,7 +289,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);
@@ -333,7 +333,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;

	}
@@ -485,7 +485,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
		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;