Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752554AbbGVUiQ (ORCPT ); Wed, 22 Jul 2015 16:38:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59203 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbbGVUiO (ORCPT ); Wed, 22 Jul 2015 16:38:14 -0400 Date: Wed, 22 Jul 2015 13:37:29 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: bhelgaas@google.com, grant.likely@linaro.org, marc.zyngier@arm.com, wangyijing@huawei.com, agordeev@redhat.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, stuart.yoder@freescale.com, bp@alien8.de Reply-To: stuart.yoder@freescale.com, bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, tony.luck@intel.com, marc.zyngier@arm.com, bhelgaas@google.com, grant.likely@linaro.org, agordeev@redhat.com, wangyijing@huawei.com In-Reply-To: <1436428847-8886-2-git-send-email-jiang.liu@linux.intel.com> References: <1436428847-8886-2-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] PCI: Add helper function msi_desc_to_pci_sysdata() Git-Commit-ID: c179c9b978b90bdf9cb39f5b5716dede157f1eaf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2653 Lines: 73 Commit-ID: c179c9b978b90bdf9cb39f5b5716dede157f1eaf Gitweb: http://git.kernel.org/tip/c179c9b978b90bdf9cb39f5b5716dede157f1eaf Author: Jiang Liu AuthorDate: Thu, 9 Jul 2015 16:00:36 +0800 Committer: Thomas Gleixner CommitDate: Wed, 22 Jul 2015 18:37:42 +0200 PCI: Add helper function msi_desc_to_pci_sysdata() Add helper function msi_desc_to_pci_sysdata() to retrieve sysdata from an MSI descriptor. To avoid pulling include/linux/pci.h into include/linux/msi.h, msi_desc_to_pci_sysdata() is implemented as a normal function instead of an inline function. Signed-off-by: Jiang Liu Reviewed-by: Yijing Wang Acked-by: Bjorn Helgaas Cc: Tony Luck Cc: linux-arm-kernel@lists.infradead.org Cc: Grant Likely Cc: Marc Zyngier Cc: Stuart Yoder Cc: Borislav Petkov Cc: Alexander Gordeev Link: http://lkml.kernel.org/r/1436428847-8886-2-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- drivers/pci/msi.c | 8 ++++++++ include/linux/msi.h | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 157eb88..ab41742 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1137,6 +1137,14 @@ int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, } EXPORT_SYMBOL(pci_enable_msix_range); +void *msi_desc_to_pci_sysdata(struct msi_desc *desc) +{ + struct pci_dev *dev = msi_desc_to_pci_dev(desc); + + return dev->bus->sysdata; +} +EXPORT_SYMBOL_GPL(msi_desc_to_pci_sysdata); + #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN /** * pci_msi_domain_write_msg - Helper to write MSI message to PCI config space diff --git a/include/linux/msi.h b/include/linux/msi.h index 8ac4a68..cfbd2af 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -60,6 +60,13 @@ static inline struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc) { return desc->dev; } + +void *msi_desc_to_pci_sysdata(struct msi_desc *desc); +#else /* CONFIG_PCI_MSI */ +static inline void *msi_desc_to_pci_sysdata(struct msi_desc *desc) +{ + return NULL; +} #endif /* CONFIG_PCI_MSI */ void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg); -- 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/