]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
PCI: layerscape: Move struct pcie_port setup to probe function
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Oct 2016 18:38:06 +0000 (13:38 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 12 Oct 2016 04:14:29 +0000 (23:14 -0500)
Do the basic pcie_port setup in the probe function for consistency with
other drivers.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/host/pci-layerscape.c

index 2b312960d01987b80dee16271ec2deea21202a32..2d77104b5422390f27ce6e58be7cb30d1ae9299f 100644 (file)
@@ -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)) {