lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: PCI: simplify struct acpi_prt_entry

Browse Source 
Remove unused "irq" field, remove unnecessary struct,
rename "handle" to "link".

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
2008-12-08 21:31:27 -07:00
committed by Len Brown
parent 3604a9f445
commit 4eaf6db3ea
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/acpi/pci_irq.c
View File

@@ -45,11 +45,8 @@ struct acpi_prt_entry {
struct list_head list; struct list_head list;
struct acpi_pci_id id; struct acpi_pci_id id;
u8 pin; u8 pin;
struct { acpi_handle link;
acpi_handle handle; u32 index; /* GSI, or link _CRS index */
u32 index;
} link;
u32 irq;
}; };
static LIST_HEAD(acpi_prt_list); static LIST_HEAD(acpi_prt_list);
@@ -205,6 +202,8 @@ acpi_pci_irq_add_entry(acpi_handle handle,
do_prt_fixups(entry, prt); do_prt_fixups(entry, prt);
entry->index = prt->source_index;
/* /*
* Type 1: Dynamic * Type 1: Dynamic
* --------------- * ---------------
@@ -218,10 +217,9 @@ acpi_pci_irq_add_entry(acpi_handle handle,
* (e.g. exists somewhere 'below' this _PRT entry in the ACPI * (e.g. exists somewhere 'below' this _PRT entry in the ACPI
* namespace). * namespace).
*/ */
if (prt->source[0]) { if (prt->source[0])
acpi_get_handle(handle, prt->source, &entry->link.handle); acpi_get_handle(handle, prt->source, &entry->link);
entry->link.index = prt->source_index;
}
/* /*
* Type 2: Static * Type 2: Static
* -------------- * --------------
@@ -229,14 +227,12 @@ acpi_pci_irq_add_entry(acpi_handle handle,
* the IRQ value, which is hardwired to specific interrupt inputs on * the IRQ value, which is hardwired to specific interrupt inputs on
* the interrupt controller. * the interrupt controller.
*/ */
else
entry->link.index = prt->source_index;
ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO, ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO,
" %04x:%02x:%02x[%c] -> %s[%d]\n", " %04x:%02x:%02x[%c] -> %s[%d]\n",
entry->id.segment, entry->id.bus, entry->id.segment, entry->id.bus,
entry->id.device, pin_name(entry->pin), entry->id.device, pin_name(entry->pin),
prt->source, entry->link.index)); prt->source, entry->index));
spin_lock(&acpi_prt_lock); spin_lock(&acpi_prt_lock);
list_add_tail(&entry->list, &acpi_prt_list); list_add_tail(&entry->list, &acpi_prt_list);
@@ -310,17 +306,16 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
int irq; int irq;
if (entry->link.handle) { if (entry->link) {
irq = acpi_pci_link_allocate_irq(entry->link.handle, irq = acpi_pci_link_allocate_irq(entry->link, entry->index,
entry->link.index, triggering, triggering, polarity, link);
polarity, link);
if (irq < 0) { if (irq < 0) {
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
"Invalid IRQ link routing entry\n"); "Invalid IRQ link routing entry\n");
return -1; return -1;
} }
} else { } else {
irq = entry->link.index; irq = entry->index;
*triggering = ACPI_LEVEL_SENSITIVE; *triggering = ACPI_LEVEL_SENSITIVE;
*polarity = ACPI_ACTIVE_LOW; *polarity = ACPI_ACTIVE_LOW;
} }
@@ -334,10 +329,10 @@ acpi_pci_free_irq(struct acpi_prt_entry *entry)
{ {
int irq; int irq;
if (entry->link.handle) { if (entry->link) {
irq = acpi_pci_link_free_irq(entry->link.handle); irq = acpi_pci_link_free_irq(entry->link);
} else { } else {
irq = entry->link.index; irq = entry->index;
} }
return irq; return irq;
} }