|
 |
1632d2 |
Date: Thu, 18 Jun 2020 19:42:44 -0400
|
|
|
1632d2 |
From: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
1632d2 |
To: rhkernel-list@redhat.com
|
|
|
1632d2 |
Cc: darcari@redhat.com, nhorman@redhat.com, linville@redhat.com
|
|
|
1632d2 |
Subject: [PATCH RHEL-8.3 09/16] ionic: ionic_intr_free parameter change
|
|
|
1632d2 |
|
|
|
1632d2 |
Change the ionic_intr_free parameter from struct ionic_lif to
|
|
|
1632d2 |
struct ionic since that's what it actually cares about.
|
|
|
1632d2 |
|
|
|
1632d2 |
Signed-off-by: Shannon Nelson <snelson@pensando.io>
|
|
|
1632d2 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
1632d2 |
(cherry picked from commit 36ac2c50924892a28e17ff463e354fec7650ee19)
|
|
|
1632d2 |
Bugzilla: 1848149
|
|
|
1632d2 |
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29498383
|
|
|
1632d2 |
Tested: QE tested devel kernel as well as the partner
|
|
|
1632d2 |
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
1632d2 |
---
|
|
|
1632d2 |
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 ++++++------
|
|
|
1632d2 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
1632d2 |
|
|
|
1632d2 |
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
index 423d2443d1c8..d52928ea539d 100644
|
|
|
1632d2 |
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
|
|
|
1632d2 |
@@ -197,10 +197,10 @@ static int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
|
|
|
1632d2 |
return 0;
|
|
|
1632d2 |
}
|
|
|
1632d2 |
|
|
|
1632d2 |
-static void ionic_intr_free(struct ionic_lif *lif, int index)
|
|
|
1632d2 |
+static void ionic_intr_free(struct ionic *ionic, int index)
|
|
|
1632d2 |
{
|
|
|
1632d2 |
- if (index != INTR_INDEX_NOT_ASSIGNED && index < lif->ionic->nintrs)
|
|
|
1632d2 |
- clear_bit(index, lif->ionic->intrs);
|
|
|
1632d2 |
+ if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs)
|
|
|
1632d2 |
+ clear_bit(index, ionic->intrs);
|
|
|
1632d2 |
}
|
|
|
1632d2 |
|
|
|
1632d2 |
static int ionic_qcq_enable(struct ionic_qcq *qcq)
|
|
|
1632d2 |
@@ -310,7 +310,7 @@ static void ionic_qcq_free(struct ionic_lif *lif, struct ionic_qcq *qcq)
|
|
|
1632d2 |
irq_set_affinity_hint(qcq->intr.vector, NULL);
|
|
|
1632d2 |
devm_free_irq(dev, qcq->intr.vector, &qcq->napi);
|
|
|
1632d2 |
qcq->intr.vector = 0;
|
|
|
1632d2 |
- ionic_intr_free(lif, qcq->intr.index);
|
|
|
1632d2 |
+ ionic_intr_free(lif->ionic, qcq->intr.index);
|
|
|
1632d2 |
}
|
|
|
1632d2 |
|
|
|
1632d2 |
devm_kfree(dev, qcq->cq.info);
|
|
|
1632d2 |
@@ -356,7 +356,7 @@ static void ionic_link_qcq_interrupts(struct ionic_qcq *src_qcq,
|
|
|
1632d2 |
struct ionic_qcq *n_qcq)
|
|
|
1632d2 |
{
|
|
|
1632d2 |
if (WARN_ON(n_qcq->flags & IONIC_QCQ_F_INTR)) {
|
|
|
1632d2 |
- ionic_intr_free(n_qcq->cq.lif, n_qcq->intr.index);
|
|
|
1632d2 |
+ ionic_intr_free(n_qcq->cq.lif->ionic, n_qcq->intr.index);
|
|
|
1632d2 |
n_qcq->flags &= ~IONIC_QCQ_F_INTR;
|
|
|
1632d2 |
}
|
|
|
1632d2 |
|
|
|
1632d2 |
@@ -508,7 +508,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
|
|
|
1632d2 |
devm_free_irq(dev, new->intr.vector, &new->napi);
|
|
|
1632d2 |
err_out_free_intr:
|
|
|
1632d2 |
if (flags & IONIC_QCQ_F_INTR)
|
|
|
1632d2 |
- ionic_intr_free(lif, new->intr.index);
|
|
|
1632d2 |
+ ionic_intr_free(lif->ionic, new->intr.index);
|
|
|
1632d2 |
err_out:
|
|
|
1632d2 |
dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err);
|
|
|
1632d2 |
return err;
|
|
|
1632d2 |
--
|
|
|
1632d2 |
2.16.4
|
|
|
1632d2 |
|
|
|
1632d2 |
|