Skip to content

Commit

Permalink
can: peak_canfd: use ndev irq instead of pci_dev one
Browse files Browse the repository at this point in the history
This cosmetic change should facilitate in the future the use of MSI
rather than legacy INTx interrupts.

Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Stephane Grosjean authored and Marc Kleine-Budde committed Jul 27, 2018
1 parent f6c740f commit cc5f9bb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/can/peak_canfd/peak_pciefd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ static int pciefd_pre_cmd(struct peak_canfd_priv *ucan)
break;

/* going into operational mode: setup IRQ handler */
err = request_irq(priv->board->pci_dev->irq,
err = request_irq(priv->ucan.ndev->irq,
pciefd_irq_handler,
IRQF_SHARED,
PCIEFD_DRV_NAME,
Expand Down Expand Up @@ -496,7 +496,7 @@ static int pciefd_post_cmd(struct peak_canfd_priv *ucan)
pciefd_can_writereg(priv, CANFD_CTL_IEN_BIT,
PCIEFD_REG_CAN_RX_CTL_CLR);

free_irq(priv->board->pci_dev->irq, priv);
free_irq(priv->ucan.ndev->irq, priv);

ucan->can.state = CAN_STATE_STOPPED;

Expand Down Expand Up @@ -688,7 +688,7 @@ static int pciefd_can_probe(struct pciefd_board *pciefd)
pciefd->can[pciefd->can_count] = priv;

dev_info(&pciefd->pci_dev->dev, "%s at reg_base=0x%p irq=%d\n",
ndev->name, priv->reg_base, pciefd->pci_dev->irq);
ndev->name, priv->reg_base, ndev->irq);

return 0;

Expand Down

0 comments on commit cc5f9bb

Please sign in to comment.