Skip to content

Commit 1fcb6a8

Browse files
Sinan Kayarafaeljw
authored andcommitted
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 <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 5c5087a commit 1fcb6a8

File tree

3 files changed

+0
-38
lines changed

3 files changed

+0
-38
lines changed

arch/x86/pci/acpi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ int __init pci_acpi_init(void)
396396
return -ENODEV;
397397

398398
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
399-
acpi_irq_penalty_init();
400399
pcibios_enable_irq = acpi_pci_irq_enable;
401400
pcibios_disable_irq = acpi_pci_irq_disable;
402401
x86_init.pci.init_irq = x86_init_noop;

drivers/acpi/pci_link.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -520,42 +520,6 @@ static int acpi_irq_get_penalty(int irq)
520520
return penalty;
521521
}
522522

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-
559523
static int acpi_irq_balance = -1; /* 0: static, 1: balance */
560524

561525
static int acpi_pci_link_allocate(struct acpi_pci_link *link)

include/acpi/acpi_drivers.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878

7979
/* ACPI PCI Interrupt Link (pci_link.c) */
8080

81-
int acpi_irq_penalty_init(void);
8281
int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
8382
int *polarity, char **name);
8483
int acpi_pci_link_free_irq(acpi_handle handle);

0 commit comments

Comments
 (0)