From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbbG2W1b (ORCPT ); Wed, 29 Jul 2015 18:27:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37050 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753995AbbG2W13 (ORCPT ); Wed, 29 Jul 2015 18:27:29 -0400 Date: Wed, 29 Jul 2015 15:26:50 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: wangyijing@huawei.com, marc.zyngier@arm.com, bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, dhdang@apm.com, jason@lakedaemon.net, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, hpa@zytor.com, majun258@huawei.com, tglx@linutronix.de, mingo@kernel.org Reply-To: majun258@huawei.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, jiang.liu@linux.intel.com, hanjun.guo@linaro.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, jason@lakedaemon.net, lorenzo.pieralisi@arm.com, linux-arm-kernel@lists.infradead.org, dhdang@apm.com, wangyijing@huawei.com, marc.zyngier@arm.com In-Reply-To: <1438091186-10244-8-git-send-email-marc.zyngier@arm.com> References: <1438091186-10244-8-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] PCI/MSI: Let pci_msi_get_domain use struct device: :msi_domain Git-Commit-ID: d8a1cb7575502d2be502a65ecb344ff05c8d9f44 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 Commit-ID: d8a1cb7575502d2be502a65ecb344ff05c8d9f44 Gitweb: http://git.kernel.org/tip/d8a1cb7575502d2be502a65ecb344ff05c8d9f44 Author: Marc Zyngier AuthorDate: Tue, 28 Jul 2015 14:46:14 +0100 Committer: Thomas Gleixner CommitDate: Thu, 30 Jul 2015 00:14:37 +0200 PCI/MSI: Let pci_msi_get_domain use struct device::msi_domain Now that we can easily find which MSI domain a PCI device is using, use dev_get_msi_domain as a way to retrieve the information. The original code is still used as a fallback. Acked-by: Bjorn Helgaas Reviewed-by: Hanjun Guo Signed-off-by: Marc Zyngier Cc: Cc: Yijing Wang Cc: Ma Jun Cc: Lorenzo Pieralisi Cc: Duc Dang Cc: Jiang Liu Cc: Jason Cooper Link: http://lkml.kernel.org/r/1438091186-10244-8-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/pci/msi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 3aae7c9..4603344 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev) static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) { - struct irq_domain *domain = NULL; + struct irq_domain *domain; - if (dev->bus->msi) - domain = dev->bus->msi->domain; - if (!domain) - domain = arch_get_pci_msi_domain(dev); + domain = dev_get_msi_domain(&dev->dev); + if (domain) + return domain; - return domain; + if (dev->bus->msi && (domain = dev->bus->msi->domain)) + return domain; + + return arch_get_pci_msi_domain(dev); } static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)