ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init()

acpi_irq_get_penalty is now calculating the penalty on the fly now.
No need to maintain global list of penalties or calculate them
at the init time. Removing duplicate code in acpi_irq_penalty_init.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 3cd69832d7f4c6f3743bbb3a190c39672c89461d..b2a4e2a61f6b8f41775c47b0aed020a6441e5d66 100644 (file)
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -396,7 +396,6 @@ int __init pci_acpi_init(void)
                return -ENODEV;
 
        printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
-       acpi_irq_penalty_init();
        pcibios_enable_irq = acpi_pci_irq_enable;
        pcibios_disable_irq = acpi_pci_irq_disable;
        x86_init.pci.init_irq = x86_init_noop;

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 12ea78495b47b385090dc5a86cfceee612ab6e70..ab39208ba7e503e3b6a6824d045dddba1d9d6111 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -520,42 +520,6 @@ static int acpi_irq_get_penalty(int irq)
        return penalty;
 }
 
-int __init acpi_irq_penalty_init(void)
-{
-       struct acpi_pci_link *link;
-       int i;
-
-       /*
-        * Update penalties to facilitate IRQ balancing.
-        */
-       list_for_each_entry(link, &acpi_link_list, list) {
-
-               /*
-                * reflect the possible and active irqs in the penalty table --
-                * useful for breaking ties.
-                */
-               if (link->irq.possible_count) {
-                       int penalty =
-                           PIRQ_PENALTY_PCI_POSSIBLE /
-                           link->irq.possible_count;
-
-                       for (i = 0; i < link->irq.possible_count; i++) {
-                               if (link->irq.possible[i] < ACPI_MAX_ISA_IRQS)
-                                       acpi_isa_irq_penalty[link->irq.
-                                                        possible[i]] +=
-                                           penalty;
-                       }
-
-               } else if (link->irq.active &&
-                               (link->irq.active < ACPI_MAX_ISA_IRQS)) {
-                       acpi_isa_irq_penalty[link->irq.active] +=
-                           PIRQ_PENALTY_PCI_POSSIBLE;
-               }
-       }
-
-       return 0;
-}
-
 static int acpi_irq_balance = -1;      /* 0: static, 1: balance */
 
 static int acpi_pci_link_allocate(struct acpi_pci_link *link)

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 29c691265b49357bc0d036b71897348806c58e6c..797ae2ec8eee2d129653514cea7b891db96e38d6 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -78,7 +78,6 @@
 
 /* ACPI PCI Interrupt Link (pci_link.c) */
 
-int acpi_irq_penalty_init(void);
 int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
                               int *polarity, char **name);
 int acpi_pci_link_free_irq(acpi_handle handle);