diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 12:33:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 12:33:42 -0800 |
commit | a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd (patch) | |
tree | 327a48bb1acf009d521f0b025a203701d83451b6 /include | |
parent | b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e (diff) | |
parent | 61d9e854dfb91b46b99ffd3d31fc7d45d2b95f31 (diff) | |
download | linux-stable-a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd.tar.gz linux-stable-a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd.tar.bz2 linux-stable-a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd.zip |
Merge tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Enumeration:
Revert x86 pcibios_alloc_irq() to fix regression (Bjorn Helgaas)
Marvell MVEBU host bridge driver:
Restrict build to 32-bit ARM (Thierry Reding)"
* tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: mvebu: Restrict build to 32-bit ARM
Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()"
Revert "PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed"
Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 27df4a6585da..27716254dcc5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -988,23 +988,6 @@ static inline int pci_is_managed(struct pci_dev *pdev) return pdev->is_managed; } -static inline void pci_set_managed_irq(struct pci_dev *pdev, unsigned int irq) -{ - pdev->irq = irq; - pdev->irq_managed = 1; -} - -static inline void pci_reset_managed_irq(struct pci_dev *pdev) -{ - pdev->irq = 0; - pdev->irq_managed = 0; -} - -static inline bool pci_has_managed_irq(struct pci_dev *pdev) -{ - return pdev->irq_managed && pdev->irq > 0; -} - void pci_disable_device(struct pci_dev *dev); extern unsigned int pcibios_max_latency; |