tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Shannon Nelson and committed by
David S. Miller 36ac2c50 5c784311

+6 -6
+6 -6
drivers/net/ethernet/pensando/ionic/ionic_lif.c
··· 197 197 return 0; 198 198 } 199 199 200 - static void ionic_intr_free(struct ionic_lif *lif, int index) 200 + static void ionic_intr_free(struct ionic *ionic, int index) 201 201 { 202 - if (index != INTR_INDEX_NOT_ASSIGNED && index < lif->ionic->nintrs) 203 - clear_bit(index, lif->ionic->intrs); 202 + if (index != INTR_INDEX_NOT_ASSIGNED && index < ionic->nintrs) 203 + clear_bit(index, ionic->intrs); 204 204 } 205 205 206 206 static int ionic_qcq_enable(struct ionic_qcq *qcq) ··· 310 310 irq_set_affinity_hint(qcq->intr.vector, NULL); 311 311 devm_free_irq(dev, qcq->intr.vector, &qcq->napi); 312 312 qcq->intr.vector = 0; 313 - ionic_intr_free(lif, qcq->intr.index); 313 + ionic_intr_free(lif->ionic, qcq->intr.index); 314 314 } 315 315 316 316 devm_kfree(dev, qcq->cq.info); ··· 356 356 struct ionic_qcq *n_qcq) 357 357 { 358 358 if (WARN_ON(n_qcq->flags & IONIC_QCQ_F_INTR)) { 359 - ionic_intr_free(n_qcq->cq.lif, n_qcq->intr.index); 359 + ionic_intr_free(n_qcq->cq.lif->ionic, n_qcq->intr.index); 360 360 n_qcq->flags &= ~IONIC_QCQ_F_INTR; 361 361 } 362 362 ··· 508 508 devm_free_irq(dev, new->intr.vector, &new->napi); 509 509 err_out_free_intr: 510 510 if (flags & IONIC_QCQ_F_INTR) 511 - ionic_intr_free(lif, new->intr.index); 511 + ionic_intr_free(lif->ionic, new->intr.index); 512 512 err_out: 513 513 dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err); 514 514 return err;