diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-06 14:38:06 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-12 00:14:29 -0400 |
| commit | fefe6733e516f2fdc4afeb060ad5b5e45afbcfbd (patch) | |
| tree | 0afe991124d811a77046c0718924394891015ae9 /drivers/pci | |
| parent | 7b0b11133cbf14fe7113a7fa8506ac18f35c9ea5 (diff) | |
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.c | 10 |
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[] = { | |||
| 216 | static int __init ls_add_pcie_port(struct ls_pcie *pcie, | 216 | static int __init ls_add_pcie_port(struct ls_pcie *pcie, |
| 217 | struct platform_device *pdev) | 217 | struct platform_device *pdev) |
| 218 | { | 218 | { |
| 219 | struct device *dev = &pdev->dev; | ||
| 220 | struct pcie_port *pp = &pcie->pp; | 219 | struct pcie_port *pp = &pcie->pp; |
| 220 | struct device *dev = pp->dev; | ||
| 221 | int ret; | 221 | int ret; |
| 222 | 222 | ||
| 223 | pp->dev = dev; | ||
| 224 | pp->ops = pcie->drvdata->ops; | ||
| 225 | |||
| 226 | ret = dw_pcie_host_init(pp); | 223 | ret = dw_pcie_host_init(pp); |
| 227 | if (ret) { | 224 | if (ret) { |
| 228 | dev_err(dev, "failed to initialize host\n"); | 225 | dev_err(dev, "failed to initialize host\n"); |
| @@ -237,6 +234,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) | |||
| 237 | struct device *dev = &pdev->dev; | 234 | struct device *dev = &pdev->dev; |
| 238 | const struct of_device_id *match; | 235 | const struct of_device_id *match; |
| 239 | struct ls_pcie *pcie; | 236 | struct ls_pcie *pcie; |
| 237 | struct pcie_port *pp; | ||
| 240 | struct resource *dbi_base; | 238 | struct resource *dbi_base; |
| 241 | int ret; | 239 | int ret; |
| 242 | 240 | ||
| @@ -248,6 +246,10 @@ static int __init ls_pcie_probe(struct platform_device *pdev) | |||
| 248 | if (!pcie) | 246 | if (!pcie) |
| 249 | return -ENOMEM; | 247 | return -ENOMEM; |
| 250 | 248 | ||
| 249 | pp = &pcie->pp; | ||
| 250 | pp->dev = dev; | ||
| 251 | pp->ops = pcie->drvdata->ops; | ||
| 252 | |||
| 251 | dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); | 253 | dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); |
| 252 | pcie->pp.dbi_base = devm_ioremap_resource(dev, dbi_base); | 254 | pcie->pp.dbi_base = devm_ioremap_resource(dev, dbi_base); |
| 253 | if (IS_ERR(pcie->pp.dbi_base)) { | 255 | if (IS_ERR(pcie->pp.dbi_base)) { |