diff options
| author | Niklas Cassel | 2017-12-20 00:29:29 +0100 |
|---|---|---|
| committer | Lorenzo Pieralisi | 2017-12-21 12:10:25 +0100 |
| commit | 71890ea0a0b5632c31be8d81c6c94b6541a898ff (patch) | |
| tree | 10b011d91f66f9250965ec8330c867b2c5f6afba | |
| parent | PCI: dwc: dra7xx: Refactor Kconfig and Makefile handling for host/ep mode (diff) | |
| download | kernel-qcow2-linux-71890ea0a0b5632c31be8d81c6c94b6541a898ff.tar.gz kernel-qcow2-linux-71890ea0a0b5632c31be8d81c6c94b6541a898ff.tar.xz kernel-qcow2-linux-71890ea0a0b5632c31be8d81c6c94b6541a898ff.zip | |
PCI: dwc: dra7xx: Assign pp->ops in dra7xx_add_pcie_port() rather than in probe
Assign pp->ops in *_add_pcie_port() to match how it is done in other
drivers like exynos, imx7, keystone, armada8k, artpec6, designware-plat,
hisi, kirin and spear13xx.
This is probably a remainder since when dev and ops were assigned as
members to pp. Since we now assign them as members to struct dw_pcie,
the pp->ops assignment should definitely be in dra7xx_add_pcie_port().
This is done so that the compiler (in a later commit) can remove more
code when enabling only one of the two supported modes (host/ep) in
the dra7xx driver.
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
| -rw-r--r-- | drivers/pci/dwc/pci-dra7xx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c index af95530b0b44..02268dd33f12 100644 --- a/drivers/pci/dwc/pci-dra7xx.c +++ b/drivers/pci/dwc/pci-dra7xx.c @@ -461,6 +461,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, if (!pci->dbi_base) return -ENOMEM; + pp->ops = &dra7xx_pcie_host_ops; + ret = dw_pcie_host_init(pp); if (ret) { dev_err(dev, "failed to initialize host\n"); @@ -590,7 +592,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) void __iomem *base; struct resource *res; struct dw_pcie *pci; - struct pcie_port *pp; struct dra7xx_pcie *dra7xx; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -618,9 +619,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &dw_pcie_ops; - pp = &pci->pp; - pp->ops = &dra7xx_pcie_host_ops; - irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(dev, "missing IRQ resource: %d\n", irq); |