summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-10-06 13:38:06 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-10-11 23:14:29 -0500
commitfefe6733e516f2fdc4afeb060ad5b5e45afbcfbd (patch)
tree0afe991124d811a77046c0718924394891015ae9 /drivers/pci
parent7b0b11133cbf14fe7113a7fa8506ac18f35c9ea5 (diff)
downloadlinux-fefe6733e516f2fdc4afeb060ad5b5e45afbcfbd.tar.bz2
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: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-layerscape.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index 2b312960d019..2d77104b5422 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -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)) {