Commit a78f2e07 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents a66999a3 9aae3af8

drivers/pci/controller/cadence/pcie-cadence-ep.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/pci/controller/cadence/pcie-cadence-host.c

+2 −6
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE