x86: Remove never-called arch_setup_msi_irq() (422e79a8) · Commits · 戴 / test

Since commit , "x64, x2apic/intr-remap: MSI and MSI-X support for interrupt remapping infrastructure", x86 has had an implementation of arch_setup_msi_irqs(). That implementation does not call arch_setup_msi_irq(), instead it calls setup_irq(). No other x86 code calls arch_setup_msi_irq(). That leaves only arch_setup_msi_irqs() in drivers/pci/msi.c, but that routine is overridden by the x86 version of arch_setup_msi_irqs(). So arch_setup_msi_irq() is dead code, remove it. Signed-off-by:

Michael Ellerman <michael@ellerman.id.au> Signed-off-by:

H. Peter Anvin <hpa@zytor.com>

arch/x86/kernel/io_apic.c

+0 −34

Original line number	Diff line number	Diff line
		@@ -3462,40 +3462,6 @@ static int setup_msi_irq(struct pci_dev dev, struct msi_desc msidesc, int irq)
		return 0;
		}

		int arch_setup_msi_irq(struct pci_dev dev, struct msi_desc msidesc)
		{
		unsigned int irq;
		int ret;
		unsigned int irq_want;

		irq_want = nr_irqs_gsi;
		irq = create_irq_nr(irq_want);
		if (irq == 0)
		return -1;

		#ifdef CONFIG_INTR_REMAP
		if (!intr_remapping_enabled)
		goto no_ir;

		ret = msi_alloc_irte(dev, irq, 1);
		if (ret < 0)
		goto error;
		no_ir:
		#endif
		ret = setup_msi_irq(dev, msidesc, irq);
		if (ret < 0) {
		destroy_irq(irq);
		return ret;
		}
		return 0;

		#ifdef CONFIG_INTR_REMAP
		error:
		destroy_irq(irq);
		return ret;
		#endif
		}

		int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
		{
		unsigned int irq;

Admin message