From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com ([192.55.52.88]:61402 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753914AbaKOOVa (ORCPT ); Sat, 15 Nov 2014 09:21:30 -0500 From: Jiang Liu To: Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Grant Likely , Marc Zyngier , Yijing Wang , Yingjoe Chen , Borislav Petkov , "H. Peter Anvin" , Matthias Brugger , Jiang Liu , Alexander Gordeev Cc: Tony Luck , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [Patch V2 1/9] PCI, MSI: Fix errors caused by commit e5f1a59c4e12 Date: Sat, 15 Nov 2014 22:23:59 +0800 Message-Id: <1416061447-9472-2-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1416061447-9472-1-git-send-email-jiang.liu@linux.intel.com> References: <1416061447-9472-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org List-ID: Better to fold into commit e5f1a59c4e12 ("PCI/MSI: Rename write_msi_msg() to pci_write_msi_msg()"). Signed-off-by: Jiang Liu --- drivers/pci/msi.c | 2 +- include/linux/msi.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 564850b1316e..9c53b865cb1b 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1084,7 +1084,7 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg) * MSI message denotes a contiguous group of IRQs, written for 0th IRQ. */ if (desc->irq == irq_data->irq) - pci_write_msi_msg(desc, msg); + __pci_write_msi_msg(desc, msg); } /* diff --git a/include/linux/msi.h b/include/linux/msi.h index 8112a17cdca1..190c7abbec84 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -44,11 +44,9 @@ struct msi_desc { struct msi_msg msg; }; -#ifdef CONFIG_PCI_MSI void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg); -#endif /* * The arch hooks to setup up msi irqs. Those functions are -- 1.7.10.4