diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:38 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:38 -0500 |
| commit | a78f2e07d047bcb3d7b9155449b7c6ea8bc65092 (patch) | |
| tree | c73a00b2bda80fa8608de629e667b6a6b858807e /drivers/pci | |
| parent | a66999a3440a7466335312bfcfda97d67cfa0e06 (diff) | |
| parent | 9aae3af8767cdfbdcb2d59c008b9477e82ab1029 (diff) | |
| download | linux-a78f2e07d047bcb3d7b9155449b7c6ea8bc65092.tar.bz2 | |
Merge branch 'remotes/lorenzo/pci/cadence'
- Remove obsolete path from comment (Flavio Suligoi)
- Simplify cdns_pcie_host_init_address_translation() (Qinglang Miao)
* remotes/lorenzo/pci/cadence:
PCI: cadence: Simplify cdns_pcie_host_init_address_translation() return expression
PCI: cadence-ep: Remove obsolete path from comment
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence-ep.c | 1 | ||||
| -rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence-host.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c index 254a3e1eff50..84cc58dc8512 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c @@ -328,7 +328,6 @@ static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 intx) cdns_pcie_ep_assert_intx(ep, fn, intx, true); /* * The mdelay() value was taken from dra7xx_pcie_raise_legacy_irq() - * from drivers/pci/dwc/pci-dra7xx.c */ mdelay(1); cdns_pcie_ep_assert_intx(ep, fn, intx, false); diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c index 4550e0d469ca..811c1cb2e8de 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-host.c +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c @@ -337,7 +337,7 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc) struct resource_entry *entry; u64 cpu_addr = cfg_res->start; u32 addr0, addr1, desc1; - int r, err, busnr = 0; + int r, busnr = 0; entry = resource_list_first_type(&bridge->windows, IORESOURCE_BUS); if (entry) @@ -383,11 +383,7 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc) r++; } - err = cdns_pcie_host_map_dma_ranges(rc); - if (err) - return err; - - return 0; + return cdns_pcie_host_map_dma_ranges(rc); } static int cdns_pcie_host_init(struct device *dev, |