lkml.org 
[lkml]   [2014]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/27] PCI: mvebu: Save msi chip in pci_sys_data
    Date
    Save msi chip in pci_sys_data instead of assign
    msi chip to every pci bus in .add_bus().

    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    ---
    drivers/pci/host/pci-mvebu.c | 10 +++-------
    1 files changed, 3 insertions(+), 7 deletions(-)

    diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
    index b1315e1..f8e9c6c 100644
    --- a/drivers/pci/host/pci-mvebu.c
    +++ b/drivers/pci/host/pci-mvebu.c
    @@ -774,12 +774,6 @@ static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys)
    return bus;
    }

    -static void mvebu_pcie_add_bus(struct pci_bus *bus)
    -{
    - struct mvebu_pcie *pcie = sys_to_pcie(bus->sysdata);
    - bus->msi = pcie->msi;
    -}
    -
    static resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
    const struct resource *res,
    resource_size_t start,
    @@ -816,6 +810,9 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)

    memset(&hw, 0, sizeof(hw));

    +#ifdef CONFIG_PCI_MSI
    + hw.msi_chip = pcie->msi;
    +#endif
    hw.nr_controllers = 1;
    hw.private_data = (void **)&pcie;
    hw.setup = mvebu_pcie_setup;
    @@ -823,7 +820,6 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
    hw.map_irq = of_irq_parse_and_map_pci;
    hw.ops = &mvebu_pcie_ops;
    hw.align_resource = mvebu_pcie_align_resource;
    - hw.add_bus = mvebu_pcie_add_bus;

    pci_common_init(&hw);
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2014-10-15 05:01    [W:4.121 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site