From: Bjorn Helgaas Date: Wed, 17 Feb 2016 18:26:33 +0000 (-0600) Subject: Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled" X-Git-Tag: v4.14-rc1~3710^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe25d078874f2c29c38f4160467d74f5756537c9;p=platform%2Fkernel%2Flinux-rpi.git Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled" Revert 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is enabled"). This is part of reverting 991de2e59090 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()") to fix regressions it introduced. Link: https://bugzilla.kernel.org/show_bug.cgi?id=111211 Fixes: 991de2e59090 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()") Signed-off-by: Bjorn Helgaas Acked-by: Rafael J. Wysocki CC: Jiang Liu CC: Joerg Roedel --- diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 2879efc..cb499c5 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -713,14 +713,6 @@ int pcibios_add_device(struct pci_dev *dev) int pcibios_alloc_irq(struct pci_dev *dev) { - /* - * If the PCI device was already claimed by core code and has - * MSI enabled, probing of the pcibios IRQ will overwrite - * dev->irq. So bail out if MSI is already enabled. - */ - if (pci_dev_msi_enabled(dev)) - return -EBUSY; - return pcibios_enable_irq(dev); }