PCI: dra7xx: Move struct pcie_port setup to probe function
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Oct 2016 18:33:06 +0000 (13:33 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 12 Oct 2016 02:14:30 +0000 (21: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-dra7xx.c

index efb24b8..bb77c35 100644 (file)
@@ -267,13 +267,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
                                       struct platform_device *pdev)
 {
        int ret;
-       struct pcie_port *pp;
+       struct pcie_port *pp = &dra7xx->pp;
+       struct device *dev = pp->dev;
        struct resource *res;
-       struct device *dev = &pdev->dev;
-
-       pp = &dra7xx->pp;
-       pp->dev = dev;
-       pp->ops = &dra7xx_pcie_host_ops;
 
        pp->irq = platform_get_irq(pdev, 1);
        if (pp->irq < 0) {
@@ -320,6 +316,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
        void __iomem *base;
        struct resource *res;
        struct dra7xx_pcie *dra7xx;
+       struct pcie_port *pp;
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        char name[10];
@@ -331,6 +328,10 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
        if (!dra7xx)
                return -ENOMEM;
 
+       pp = &dra7xx->pp;
+       pp->dev = dev;
+       pp->ops = &dra7xx_pcie_host_ops;
+
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                dev_err(dev, "missing IRQ resource\n");