Skip to content

Commit fe49067

Browse files
bjorn-helgaasbjorn-helgaas
committed
PCI: altera: Add local struct device pointers
Use a local "struct device *dev" for brevity and consistency with other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
1 parent bdf5309 commit fe49067

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

‎drivers/pci/host/pcie-altera.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ static int altera_write_cap_word(struct altera_pcie *pcie, u8 busno,
394394

395395
static void altera_wait_link_retrain(struct altera_pcie *pcie)
396396
{
397+
struct device *dev = &pcie->pdev->dev;
397398
u16 reg16;
398399
unsigned long start_jiffies;
399400

@@ -406,7 +407,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie)
406407
break;
407408

408409
if (time_after(jiffies, start_jiffies + LINK_RETRAIN_TIMEOUT)) {
409-
dev_err(&pcie->pdev->dev, "link retrain timeout\n");
410+
dev_err(dev, "link retrain timeout\n");
410411
break;
411412
}
412413
udelay(100);
@@ -419,7 +420,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie)
419420
break;
420421

421422
if (time_after(jiffies, start_jiffies + LINK_UP_TIMEOUT)) {
422-
dev_err(&pcie->pdev->dev, "link up timeout\n");
423+
dev_err(dev, "link up timeout\n");
423424
break;
424425
}
425426
udelay(100);
@@ -460,7 +461,6 @@ static int altera_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
460461
{
461462
irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq);
462463
irq_set_chip_data(irq, domain->host_data);
463-
464464
return 0;
465465
}
466466

@@ -472,12 +472,14 @@ static void altera_pcie_isr(struct irq_desc *desc)
472472
{
473473
struct irq_chip *chip = irq_desc_get_chip(desc);
474474
struct altera_pcie *pcie;
475+
struct device *dev;
475476
unsigned long status;
476477
u32 bit;
477478
u32 virq;
478479

479480
chained_irq_enter(chip, desc);
480481
pcie = irq_desc_get_handler_data(desc);
482+
dev = &pcie->pdev->dev;
481483

482484
while ((status = cra_readl(pcie, P2A_INT_STATUS)
483485
& P2A_INT_STS_ALL) != 0) {
@@ -489,8 +491,7 @@ static void altera_pcie_isr(struct irq_desc *desc)
489491
if (virq)
490492
generic_handle_irq(virq);
491493
else
492-
dev_err(&pcie->pdev->dev,
493-
"unexpected IRQ, INT%d\n", bit);
494+
dev_err(dev, "unexpected IRQ, INT%d\n", bit);
494495
}
495496
}
496497

@@ -549,30 +550,30 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
549550

550551
static int altera_pcie_parse_dt(struct altera_pcie *pcie)
551552
{
552-
struct resource *cra;
553+
struct device *dev = &pcie->pdev->dev;
553554
struct platform_device *pdev = pcie->pdev;
555+
struct resource *cra;
554556

555557
cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra");
556558
if (!cra) {
557-
dev_err(&pdev->dev, "no Cra memory resource defined\n");
559+
dev_err(dev, "no Cra memory resource defined\n");
558560
return -ENODEV;
559561
}
560562

561-
pcie->cra_base = devm_ioremap_resource(&pdev->dev, cra);
563+
pcie->cra_base = devm_ioremap_resource(dev, cra);
562564
if (IS_ERR(pcie->cra_base)) {
563-
dev_err(&pdev->dev, "failed to map cra memory\n");
565+
dev_err(dev, "failed to map cra memory\n");
564566
return PTR_ERR(pcie->cra_base);
565567
}
566568

567569
/* setup IRQ */
568570
pcie->irq = platform_get_irq(pdev, 0);
569571
if (pcie->irq <= 0) {
570-
dev_err(&pdev->dev, "failed to get IRQ: %d\n", pcie->irq);
572+
dev_err(dev, "failed to get IRQ: %d\n", pcie->irq);
571573
return -EINVAL;
572574
}
573575

574576
irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie);
575-
576577
return 0;
577578
}
578579

@@ -583,34 +584,35 @@ static void altera_pcie_host_init(struct altera_pcie *pcie)
583584

584585
static int altera_pcie_probe(struct platform_device *pdev)
585586
{
587+
struct device *dev = &pdev->dev;
586588
struct altera_pcie *pcie;
587589
struct pci_bus *bus;
588590
struct pci_bus *child;
589591
int ret;
590592

591-
pcie = devm_kzalloc(&pdev->dev, sizeof(*pcie), GFP_KERNEL);
593+
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
592594
if (!pcie)
593595
return -ENOMEM;
594596

595597
pcie->pdev = pdev;
596598

597599
ret = altera_pcie_parse_dt(pcie);
598600
if (ret) {
599-
dev_err(&pdev->dev, "Parsing DT failed\n");
601+
dev_err(dev, "Parsing DT failed\n");
600602
return ret;
601603
}
602604

603605
INIT_LIST_HEAD(&pcie->resources);
604606

605607
ret = altera_pcie_parse_request_of_pci_ranges(pcie);
606608
if (ret) {
607-
dev_err(&pdev->dev, "Failed add resources\n");
609+
dev_err(dev, "Failed add resources\n");
608610
return ret;
609611
}
610612

611613
ret = altera_pcie_init_irq_domain(pcie);
612614
if (ret) {
613-
dev_err(&pdev->dev, "Failed creating IRQ Domain\n");
615+
dev_err(dev, "Failed creating IRQ Domain\n");
614616
return ret;
615617
}
616618

@@ -620,7 +622,7 @@ static int altera_pcie_probe(struct platform_device *pdev)
620622
cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE);
621623
altera_pcie_host_init(pcie);
622624

623-
bus = pci_scan_root_bus(&pdev->dev, pcie->root_bus_nr, &altera_pcie_ops,
625+
bus = pci_scan_root_bus(dev, pcie->root_bus_nr, &altera_pcie_ops,
624626
pcie, &pcie->resources);
625627
if (!bus)
626628
return -ENOMEM;

0 commit comments

Comments
 (0)