Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753741AbbETNJZ (ORCPT ); Wed, 20 May 2015 09:09:25 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:35539 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708AbbETNJU (ORCPT ); Wed, 20 May 2015 09:09:20 -0400 MIME-Version: 1.0 In-Reply-To: <1432114845-24304-12-git-send-email-jiang.liu@linux.intel.com> References: <1432114845-24304-1-git-send-email-jiang.liu@linux.intel.com> <1432114845-24304-12-git-send-email-jiang.liu@linux.intel.com> From: Bjorn Helgaas Date: Wed, 20 May 2015 08:08:59 -0500 Message-ID: Subject: Re: [Patch v2 11/14] genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc() To: Jiang Liu Cc: Thomas Gleixner , Benjamin Herrenschmidt , Ingo Molnar , "H. Peter Anvin" , "Rafael J. Wysocki" , Randy Dunlap , Yinghai Lu , Borislav Petkov , Jingoo Han , Jason Cooper , Kevin Cernekee , Arnd Bergmann , Konrad Rzeszutek Wilk , Tony Luck , "x86@kernel.org" , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , "linux-acpi@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2502 Lines: 63 On Wed, May 20, 2015 at 4:40 AM, Jiang Liu wrote: > 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 Acked-by: Bjorn Helgaas I assume Thomas will handle this whole series. > --- > 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 e33cc0b040f2..05b2266572ce 100644 > --- a/include/linux/irq.h > +++ b/include/linux/irq.h > @@ -625,7 +625,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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/