Skip to content

Commit 69a2cb6

Browse files
Jimmy Assarssonmarckleinebudde
authored andcommitted
can: kvaser_pciefd: Add intermediate variable for device struct in probe()
Add intermediate variable, for readability and to simplify future patches. Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Signed-off-by: Jimmy Assarsson <extja@kvaser.com> Link: https://patch.msgid.link/20250725123230.8-4-extja@kvaser.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent e74249a commit 69a2cb6

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/net/can/kvaser_pciefd.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,10 +1813,11 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev,
18131813
const struct pci_device_id *id)
18141814
{
18151815
int ret;
1816+
struct device *dev = &pdev->dev;
18161817
struct kvaser_pciefd *pcie;
18171818
const struct kvaser_pciefd_irq_mask *irq_mask;
18181819

1819-
pcie = devm_kzalloc(&pdev->dev, sizeof(*pcie), GFP_KERNEL);
1820+
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
18201821
if (!pcie)
18211822
return -ENOMEM;
18221823

@@ -1855,7 +1856,7 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev,
18551856

18561857
ret = pci_alloc_irq_vectors(pcie->pci, 1, 1, PCI_IRQ_INTX | PCI_IRQ_MSI);
18571858
if (ret < 0) {
1858-
dev_err(&pcie->pci->dev, "Failed to allocate IRQ vectors.\n");
1859+
dev_err(dev, "Failed to allocate IRQ vectors.\n");
18591860
goto err_teardown_can_ctrls;
18601861
}
18611862

@@ -1868,7 +1869,7 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev,
18681869
ret = request_irq(pcie->pci->irq, kvaser_pciefd_irq_handler,
18691870
IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie);
18701871
if (ret) {
1871-
dev_err(&pcie->pci->dev, "Failed to request IRQ %d\n", pcie->pci->irq);
1872+
dev_err(dev, "Failed to request IRQ %d\n", pcie->pci->irq);
18721873
goto err_pci_free_irq_vectors;
18731874
}
18741875
iowrite32(KVASER_PCIEFD_SRB_IRQ_DPD0 | KVASER_PCIEFD_SRB_IRQ_DPD1,

0 commit comments

Comments
 (0)