diff options
author | 2024-03-25 16:09:39 +0900 | |
---|---|---|
committer | 2024-05-16 14:35:08 -0500 | |
commit | 0e1fdd222f0ac47b2b806fecfe05c1a6f797930f (patch) | |
tree | afe8429107168cfbfae878f5997fd8e4aa447ba1 | |
parent | scsi: vmw_pvscsi: Do not use PCI_IRQ_LEGACY instead of PCI_IRQ_LEGACY (diff) | |
download | linux-0e1fdd222f0ac47b2b806fecfe05c1a6f797930f.tar.gz linux-0e1fdd222f0ac47b2b806fecfe05c1a6f797930f.tar.bz2 linux-0e1fdd222f0ac47b2b806fecfe05c1a6f797930f.zip |
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/20240325070944.3600338-29-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r-- | include/linux/pci.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 16493426a04f..b19992a5dfaf 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1077,8 +1077,6 @@ enum { #define PCI_IRQ_MSIX (1 << 2) /* Allow MSI-X interrupts */ #define PCI_IRQ_AFFINITY (1 << 3) /* Auto-assign affinity */ -#define PCI_IRQ_LEGACY PCI_IRQ_INTX /* Deprecated! Use PCI_IRQ_INTX */ - /* These external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI @@ -1648,8 +1646,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode, */ #define PCI_IRQ_VIRTUAL (1 << 4) -#define PCI_IRQ_ALL_TYPES \ - (PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX) +#define PCI_IRQ_ALL_TYPES (PCI_IRQ_INTX | PCI_IRQ_MSI | PCI_IRQ_MSIX) #include <linux/dmapool.h> @@ -1719,7 +1716,7 @@ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs, unsigned int max_vecs, unsigned int flags, struct irq_affinity *aff_desc) { - if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1 && dev->irq) + if ((flags & PCI_IRQ_INTX) && min_vecs == 1 && dev->irq) return 1; return -ENOSPC; } |