summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-02-17 13:26:38 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-02-17 18:23:36 -0500
commit67b4eab91caf2ad574cab1b17ae09180ea2e116e (patch)
tree29db4ab3ed4f3c73a88d1350a50e2b4039890c2a /include/linux/pci.h
parentfe25d078874f2c29c38f4160467d74f5756537c9 (diff)
Revert "PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed"
Revert 811a4e6fce09 ("PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed"). 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 <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael@kernel.org> CC: Jiang Liu <jiang.liu@linux.intel.com>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h17
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)
988 return pdev->is_managed; 988 return pdev->is_managed;
989} 989}
990 990
991static inline void pci_set_managed_irq(struct pci_dev *pdev, unsigned int irq)
992{
993 pdev->irq = irq;
994 pdev->irq_managed = 1;
995}
996
997static inline void pci_reset_managed_irq(struct pci_dev *pdev)
998{
999 pdev->irq = 0;
1000 pdev->irq_managed = 0;
1001}
1002
1003static inline bool pci_has_managed_irq(struct pci_dev *pdev)
1004{
1005 return pdev->irq_managed && pdev->irq > 0;
1006}
1007
1008void pci_disable_device(struct pci_dev *dev); 991void pci_disable_device(struct pci_dev *dev);
1009 992
1010extern unsigned int pcibios_max_latency; 993extern unsigned int pcibios_max_latency;