diff options
author | Sinan Kaya <okaya@codeaurora.org> | 2016-04-17 13:36:55 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-04 19:10:32 -0400 |
commit | 1fcb6a813c4f67a0ba189b0d057b70ba084f6e1a (patch) | |
tree | f7d3e8bfc5a89151e15ada22ce00a09036c96739 /drivers/acpi | |
parent | 5c5087a5539083305f1199f09ac2e7f14d855ff3 (diff) |
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/pci_link.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 12ea78495b47..ab39208ba7e5 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -520,42 +520,6 @@ static int acpi_irq_get_penalty(int irq) | |||
520 | return penalty; | 520 | return penalty; |
521 | } | 521 | } |
522 | 522 | ||
523 | int __init acpi_irq_penalty_init(void) | ||
524 | { | ||
525 | struct acpi_pci_link *link; | ||
526 | int i; | ||
527 | |||
528 | /* | ||
529 | * Update penalties to facilitate IRQ balancing. | ||
530 | */ | ||
531 | list_for_each_entry(link, &acpi_link_list, list) { | ||
532 | |||
533 | /* | ||
534 | * reflect the possible and active irqs in the penalty table -- | ||
535 | * useful for breaking ties. | ||
536 | */ | ||
537 | if (link->irq.possible_count) { | ||
538 | int penalty = | ||
539 | PIRQ_PENALTY_PCI_POSSIBLE / | ||
540 | link->irq.possible_count; | ||
541 | |||
542 | for (i = 0; i < link->irq.possible_count; i++) { | ||
543 | if (link->irq.possible[i] < ACPI_MAX_ISA_IRQS) | ||
544 | acpi_isa_irq_penalty[link->irq. | ||
545 | possible[i]] += | ||
546 | penalty; | ||
547 | } | ||
548 | |||
549 | } else if (link->irq.active && | ||
550 | (link->irq.active < ACPI_MAX_ISA_IRQS)) { | ||
551 | acpi_isa_irq_penalty[link->irq.active] += | ||
552 | PIRQ_PENALTY_PCI_POSSIBLE; | ||
553 | } | ||
554 | } | ||
555 | |||
556 | return 0; | ||
557 | } | ||
558 | |||
559 | static int acpi_irq_balance = -1; /* 0: static, 1: balance */ | 523 | static int acpi_irq_balance = -1; /* 0: static, 1: balance */ |
560 | 524 | ||
561 | static int acpi_pci_link_allocate(struct acpi_pci_link *link) | 525 | static int acpi_pci_link_allocate(struct acpi_pci_link *link) |