lkml.org 
[lkml]   [2024]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v4 15/18] PCI: cadence: Set cdns_pcie_host_init() global
    During the resume sequence of the host, cdns_pcie_host_init() needs to be
    called, so set it global.

    The dev function parameter is removed, as it isn't used.

    Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com>
    Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
    ---
    drivers/pci/controller/cadence/pcie-cadence-host.c | 5 ++---
    drivers/pci/controller/cadence/pcie-cadence.h | 6 ++++++
    2 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c
    index 93d9922730af..8af95e9da7ce 100644
    --- a/drivers/pci/controller/cadence/pcie-cadence-host.c
    +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c
    @@ -485,8 +485,7 @@ static int cdns_pcie_host_init_address_translation(struct cdns_pcie_rc *rc)
    return cdns_pcie_host_map_dma_ranges(rc);
    }

    -static int cdns_pcie_host_init(struct device *dev,
    - struct cdns_pcie_rc *rc)
    +int cdns_pcie_host_init(struct cdns_pcie_rc *rc)
    {
    int err;

    @@ -564,7 +563,7 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)
    for (bar = RP_BAR0; bar <= RP_NO_BAR; bar++)
    rc->avail_ib_bar[bar] = true;

    - ret = cdns_pcie_host_init(dev, rc);
    + ret = cdns_pcie_host_init(rc);
    if (ret)
    return ret;

    diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/controller/cadence/pcie-cadence.h
    index 9ca2ffca0bf9..a2e04261237d 100644
    --- a/drivers/pci/controller/cadence/pcie-cadence.h
    +++ b/drivers/pci/controller/cadence/pcie-cadence.h
    @@ -516,6 +516,7 @@ static inline bool cdns_pcie_link_up(struct cdns_pcie *pcie)

    #ifdef CONFIG_PCIE_CADENCE_HOST
    int cdns_pcie_host_link_setup(struct cdns_pcie_rc *rc);
    +int cdns_pcie_host_init(struct cdns_pcie_rc *rc);
    int cdns_pcie_host_setup(struct cdns_pcie_rc *rc);
    void __iomem *cdns_pci_map_bus(struct pci_bus *bus, unsigned int devfn,
    int where);
    @@ -525,6 +526,11 @@ static inline int cdns_pcie_host_link_setup(struct cdns_pcie_rc *rc)
    return 0;
    }

    +static inline int cdns_pcie_host_init(struct cdns_pcie_rc *rc)
    +{
    + return 0;
    +}
    +
    static inline int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)
    {
    return 0;
    --
    2.39.2


    \
     
     \ /
      Last update: 2024-05-27 15:34    [W:3.426 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site