Commit 41dd128c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] remove unused acpi_irq_to_vector()

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Now that everybody has acpi_gsi_to_irq(), we can nuke the deprecated
acpi_irq_to_vector().  No references remain.
parent 10c9a379
......@@ -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
......
......@@ -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)
{
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment