Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756045AbbGUVhM (ORCPT ); Tue, 21 Jul 2015 17:37:12 -0400 Received: from mail-ig0-f179.google.com ([209.85.213.179]:33990 "EHLO mail-ig0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755659AbbGUVhK (ORCPT ); Tue, 21 Jul 2015 17:37:10 -0400 Date: Tue, 21 Jul 2015 16:37:04 -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 v4 19/19] PCI/MSI: Drop domain field from msi_controller Message-ID: <20150721213704.GC3691@google.com> References: <1436962613-17359-1-git-send-email-marc.zyngier@arm.com> <1436962613-17359-20-git-send-email-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436962613-17359-20-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: 1819 Lines: 54 On Wed, Jul 15, 2015 at 01:16:53PM +0100, Marc Zyngier wrote: > The only three users of that field are not using the msi_controller > structure anymore, so drop it altogether. > > Signed-off-by: Marc Zyngier Acked-by: Bjorn Helgaas > --- > drivers/pci/msi.c | 2 -- > include/linux/msi.h | 3 --- > 2 files changed, 5 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index c77fdaf..31bae50 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -42,8 +42,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) > struct irq_domain *domain = NULL; > > domain = dev_get_msi_domain(&dev->dev); > - if (!domain && dev->bus->msi) > - domain = dev->bus->msi->domain; > if (!domain) > domain = arch_get_pci_msi_domain(dev); I guess this takes care of the "assignment inside if" question :) > diff --git a/include/linux/msi.h b/include/linux/msi.h > index b55cf63..e29c31f 100644 > --- a/include/linux/msi.h > +++ b/include/linux/msi.h > @@ -124,9 +124,6 @@ struct msi_controller { > struct device *dev; > struct device_node *of_node; > struct list_head list; > -#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN > - struct irq_domain *domain; > -#endif > > int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev, > struct msi_desc *desc); > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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/