From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH v8 7/9] pci: of: Parse and map the IRQ when adding the PCI device. Date: Wed, 2 Jul 2014 12:17:48 +0100 Message-ID: <20140702111748.GJ18731@arm.com> References: <1404240214-9804-1-git-send-email-Liviu.Dudau@arm.com> <1404240214-9804-8-git-send-email-Liviu.Dudau@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1404240214-9804-8-git-send-email-Liviu.Dudau@arm.com> Sender: linux-pci-owner@vger.kernel.org To: Liviu Dudau Cc: linux-pci , Bjorn Helgaas , Catalin Marinas , Benjamin Herrenschmidt , Arnd Bergmann , linaro-kernel , Tanmay Inamdar , Grant Likely , Sinan Kaya , Jingoo Han , Kukjin Kim , Suravee Suthikulanit , LKML , Device Tree ML , LAKML List-Id: devicetree@vger.kernel.org On Tue, Jul 01, 2014 at 07:43:32PM +0100, Liviu Dudau wrote: > Enhance the default implementation of pcibios_add_device() to > parse and map the IRQ of the device if a DT binding is available. > > Signed-off-by: Liviu Dudau > --- > drivers/pci/pci.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 63a54a3..8e65dc3 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1453,6 +1454,9 @@ EXPORT_SYMBOL(pcim_pin_device); > */ > int __weak pcibios_add_device(struct pci_dev *dev) > { > +#ifdef CONFIG_OF > + dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > +#endif You could avoid the #ifdef by only assigning dev->irq if of_irq_parse_and_map_pci returned something > 0. Will