lkml.org 
[lkml]   [2015]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch v3 32/36] genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
    Date
    Rename irq_data_get_msi() as irq_data_get_msi_desc() to keep consistency
    with other irq_data access helpers.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    drivers/pci/host/pcie-designware.c | 2 +-
    drivers/pci/msi.c | 2 +-
    include/linux/irq.h | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
    index 2e9f84fdd9ce..7b3432d331fd 100644
    --- a/drivers/pci/host/pcie-designware.c
    +++ b/drivers/pci/host/pcie-designware.c
    @@ -309,7 +309,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,
    static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)
    {
    struct irq_data *data = irq_get_irq_data(irq);
    - struct msi_desc *msi = irq_data_get_msi(data);
    + struct msi_desc *msi = irq_data_get_msi_desc(data);
    struct pcie_port *pp = sys_to_pcie(msi->dev->bus->sysdata);

    clear_irq_range(pp, irq, 1, data->hwirq);
    diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
    index c3e7dfcf9ff5..be6034cf5c21 100644
    --- a/drivers/pci/msi.c
    +++ b/drivers/pci/msi.c
    @@ -270,7 +270,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)

    static void msi_set_mask_bit(struct irq_data *data, u32 flag)
    {
    - struct msi_desc *desc = irq_data_get_msi(data);
    + struct msi_desc *desc = irq_data_get_msi_desc(data);

    if (desc->msi_attrib.is_msix) {
    msix_mask_irq(desc, flag);
    diff --git a/include/linux/irq.h b/include/linux/irq.h
    index 9d01cd8ca8a2..2b95fee48c55 100644
    --- a/include/linux/irq.h
    +++ b/include/linux/irq.h
    @@ -631,7 +631,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)
    return d ? d->msi_desc : NULL;
    }

    -static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)
    +static inline struct msi_desc *irq_data_get_msi_desc(struct irq_data *d)
    {
    return d->msi_desc;
    }
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2015-06-01 10:41    [W:4.052 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site