From 41dd128c2144b3f3a53a146b539db60a2269734f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 14 May 2004 20:25:29 -0700 Subject: [PATCH] [PATCH] remove unused acpi_irq_to_vector() From: Bjorn Helgaas Now that everybody has acpi_gsi_to_irq(), we can nuke the deprecated acpi_irq_to_vector(). No references remain. --- arch/i386/kernel/acpi/boot.c | 10 ---------- arch/ia64/kernel/acpi.c | 10 ---------- include/asm-i386/acpi.h | 1 - include/asm-ia64/acpi.h | 1 - 4 files changed, 22 deletions(-) diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index a91878d4e7b90..43cce510927fe 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -417,16 +417,6 @@ acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) #endif /* CONFIG_ACPI_BUS */ -#ifdef CONFIG_X86_IO_APIC -/* deprecated in favor of acpi_gsi_to_irq */ -int acpi_irq_to_vector(u32 irq) -{ - if (use_pci_vector() && !platform_legacy_irq(irq)) - irq = IO_APIC_VECTOR(irq); - return irq; -} -#endif - int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) { #ifdef CONFIG_X86_IO_APIC diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 28d4fdcb29de7..6d797d7d9f66c 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -632,16 +632,6 @@ acpi_boot_init (void) return 0; } -/* deprecated in favor of acpi_gsi_to_irq */ -int -acpi_irq_to_vector (u32 gsi) -{ - if (has_8259 && gsi < 16) - return isa_irq_to_vector(gsi); - - return gsi_to_vector(gsi); -} - int acpi_gsi_to_irq (u32 gsi, unsigned int *irq) { diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 8bfd3c1ce27d0..a6f577192bcdf 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -124,7 +124,6 @@ static inline void disable_acpi(void) extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); #ifdef CONFIG_X86_IO_APIC extern int skip_ioapic_setup; -extern int acpi_irq_to_vector(u32 irq); /* deprecated in favor of acpi_gsi_to_irq */ extern int acpi_skip_timer_override; static inline void disable_ioapic_setup(void) diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index 72be5cce381d5..3e13984cf8716 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h @@ -96,7 +96,6 @@ static inline void disable_acpi(void) { } const char *acpi_get_sysname (void); int acpi_request_vector (u32 int_type); int acpi_register_irq (u32 gsi, u32 polarity, u32 trigger); -int acpi_irq_to_vector (u32 irq); /* deprecated in favor of acpi_gsi_to_irq */ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); #ifdef CONFIG_ACPI_NUMA -- 2.53.0