]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
can: peak_canfd: use ndev irq instead of pci_dev one
authorStephane Grosjean <s.grosjean@peak-system.com>
Thu, 21 Jun 2018 13:23:28 +0000 (15:23 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 27 Jul 2018 08:40:18 +0000 (10:40 +0200)
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>
drivers/net/can/peak_canfd/peak_pciefd_main.c

index d9d569a16c362c994f5cf55b034cff3d21f9b999..3c7c0d82568f13e6ee99e5ff2a7af2c5e4abc959 100644 (file)
@@ -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,
@@ -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;
 
@@ -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;