Skip to content

Commit 0e1fdd2

Browse files
damien-lemoalbjorn-helgaas
authored andcommitted
PCI: Remove PCI_IRQ_LEGACY
Replace the last references to PCI_IRQ_LEGACY with PCI_IRQ_INTX in pci.h header file. With this change, PCI_IRQ_LEGACY is unused and we can remove its definition. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Damien Le Moal <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent a289eb2 commit 0e1fdd2

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

include/linux/pci.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,8 +1077,6 @@ enum {
10771077
#define PCI_IRQ_MSIX (1 << 2) /* Allow MSI-X interrupts */
10781078
#define PCI_IRQ_AFFINITY (1 << 3) /* Auto-assign affinity */
10791079

1080-
#define PCI_IRQ_LEGACY PCI_IRQ_INTX /* Deprecated! Use PCI_IRQ_INTX */
1081-
10821080
/* These external functions are only available when PCI support is enabled */
10831081
#ifdef CONFIG_PCI
10841082

@@ -1648,8 +1646,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
16481646
*/
16491647
#define PCI_IRQ_VIRTUAL (1 << 4)
16501648

1651-
#define PCI_IRQ_ALL_TYPES \
1652-
(PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX)
1649+
#define PCI_IRQ_ALL_TYPES (PCI_IRQ_INTX | PCI_IRQ_MSI | PCI_IRQ_MSIX)
16531650

16541651
#include <linux/dmapool.h>
16551652

@@ -1719,7 +1716,7 @@ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
17191716
unsigned int max_vecs, unsigned int flags,
17201717
struct irq_affinity *aff_desc)
17211718
{
1722-
if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1 && dev->irq)
1719+
if ((flags & PCI_IRQ_INTX) && min_vecs == 1 && dev->irq)
17231720
return 1;
17241721
return -ENOSPC;
17251722
}

0 commit comments

Comments
 (0)