diff options
author | David Shaohua Li <shaohua.li@intel.com> | 2005-07-27 23:02:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-29 22:49:38 -0400 |
commit | 87bec66b9691522414862dd8d41e430b063735ef (patch) | |
tree | f9976d7f6bb92fe3ebeda3b5d3644ac048147e62 /include | |
parent | 68ac767686fd72f37a25bb4895fb4ab0080ba755 (diff) |
[ACPI] suspend/resume ACPI PCI Interrupt Links
Add reference count and disable ACPI PCI Interrupt Link
when no device still uses it.
Warn when drivers have not released Link at suspend time.
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_drivers.h | 3 | ||||
-rw-r--r-- | include/linux/acpi.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index e00d9289201b..13f092977c0c 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -56,8 +56,9 @@ | |||
56 | /* ACPI PCI Interrupt Link (pci_link.c) */ | 56 | /* ACPI PCI Interrupt Link (pci_link.c) */ |
57 | 57 | ||
58 | int acpi_irq_penalty_init (void); | 58 | int acpi_irq_penalty_init (void); |
59 | int acpi_pci_link_get_irq (acpi_handle handle, int index, int *edge_level, | 59 | int acpi_pci_link_allocate_irq (acpi_handle handle, int index, int *edge_level, |
60 | int *active_high_low, char **name); | 60 | int *active_high_low, char **name); |
61 | int acpi_pci_link_free_irq(acpi_handle handle); | ||
61 | 62 | ||
62 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ | 63 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ |
63 | 64 | ||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 9c14959bcfa0..ca0cd240cee0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -440,9 +440,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); | |||
440 | * If this matches the last registration, any IRQ resources for gsi | 440 | * If this matches the last registration, any IRQ resources for gsi |
441 | * are freed. | 441 | * are freed. |
442 | */ | 442 | */ |
443 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
444 | void acpi_unregister_gsi (u32 gsi); | 443 | void acpi_unregister_gsi (u32 gsi); |
445 | #endif | ||
446 | 444 | ||
447 | #ifdef CONFIG_ACPI_PCI | 445 | #ifdef CONFIG_ACPI_PCI |
448 | 446 | ||
@@ -467,9 +465,7 @@ struct pci_dev; | |||
467 | int acpi_pci_irq_enable (struct pci_dev *dev); | 465 | int acpi_pci_irq_enable (struct pci_dev *dev); |
468 | void acpi_penalize_isa_irq(int irq, int active); | 466 | void acpi_penalize_isa_irq(int irq, int active); |
469 | 467 | ||
470 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
471 | void acpi_pci_irq_disable (struct pci_dev *dev); | 468 | void acpi_pci_irq_disable (struct pci_dev *dev); |
472 | #endif | ||
473 | 469 | ||
474 | struct acpi_pci_driver { | 470 | struct acpi_pci_driver { |
475 | struct acpi_pci_driver *next; | 471 | struct acpi_pci_driver *next; |