lkml.org 
[lkml]   [2017]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 08/18] PCI: dwc: dra7xx: Assign pp->ops in dra7xx_add_pcie_port() rather than in probe
    Date
    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>
    Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
    ---
    drivers/pci/dwc/pci-dra7xx.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
    index d330b7d86ce3..07c74ae3614e 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);
    --
    2.14.2
    \
     
     \ /
      Last update: 2017-11-20 14:36    [W:2.401 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site