Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753207AbbGWNOf (ORCPT ); Thu, 23 Jul 2015 09:14:35 -0400 Received: from mail-ig0-f181.google.com ([209.85.213.181]:38830 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbbGWNO0 (ORCPT ); Thu, 23 Jul 2015 09:14:26 -0400 Date: Thu, 23 Jul 2015 08:14:21 -0500 From: Bjorn Helgaas To: Marc Zyngier Cc: Thomas Gleixner , Jiang Liu , Jason Cooper , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yijing Wang , Ma Jun , Lorenzo Pieralisi , Duc Dang Subject: Re: [PATCH v5 07/19] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Message-ID: <20150723131421.GU21967@google.com> References: <1437643598-19795-1-git-send-email-marc.zyngier@arm.com> <1437643598-19795-8-git-send-email-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437643598-19795-8-git-send-email-marc.zyngier@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1531 Lines: 49 On Thu, Jul 23, 2015 at 10:26:26AM +0100, Marc Zyngier wrote: > 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. > > Signed-off-by: Marc Zyngier Acked-by: Bjorn Helgaas > --- > 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 ef4ec6e..da3c607 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; > + > + domain = dev_get_msi_domain(&dev->dev); > + if (domain) > + return domain; > > - if (dev->bus->msi) > - domain = dev->bus->msi->domain; > - if (!domain) > - domain = arch_get_pci_msi_domain(dev); > + if (dev->bus->msi && (domain = dev->bus->msi->domain)) > + return 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) > -- > 2.1.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/