Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

PCI: layerscape: Move struct pcie_port setup to probe function 



Do the basic pcie_port setup in the probe function for consistency with
other drivers.  No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7b0b1113

drivers/pci/host/pci-layerscape.c

+6 −4
Original line number Diff line number Diff line
@@ -216,13 +216,10 @@ static const struct of_device_id ls_pcie_of_match[] = { 
static int __init ls_add_pcie_port(struct ls_pcie *pcie,

				   struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct pcie_port *pp = &pcie->pp;

	struct device *dev = pp->dev;

	int ret;



	pp->dev = dev;

	pp->ops = pcie->drvdata->ops;



	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(dev, "failed to initialize host\n");
@@ -237,6 +234,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	const struct of_device_id *match;

	struct ls_pcie *pcie;

	struct pcie_port *pp;

	struct resource *dbi_base;

	int ret;
@@ -248,6 +246,10 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
	if (!pcie)

		return -ENOMEM;



	pp = &pcie->pp;

	pp->dev = dev;

	pp->ops = pcie->drvdata->ops;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");

	pcie->pp.dbi_base = devm_ioremap_resource(dev, dbi_base);

	if (IS_ERR(pcie->pp.dbi_base)) {