projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
acpi
/
pci_irq.c
diff --git
a/drivers/acpi/pci_irq.c
b/drivers/acpi/pci_irq.c
index 23a0324901307b9f0c930f7be00beeff45dbbec0..68a921d032475edbaa7740d9f880ee5bf52a8db3 100644
(file)
--- a/
drivers/acpi/pci_irq.c
+++ b/
drivers/acpi/pci_irq.c
@@
-184,7
+184,7
@@
static void do_prt_fixups(struct acpi_prt_entry *entry,
}
}
}
}
-static int acpi_pci_irq_add_entry(acpi_handle handle,
struct pci_bus *
bus,
+static int acpi_pci_irq_add_entry(acpi_handle handle,
int segment, int
bus,
struct acpi_pci_routing_table *prt)
{
struct acpi_prt_entry *entry;
struct acpi_pci_routing_table *prt)
{
struct acpi_prt_entry *entry;
@@
-198,8
+198,8
@@
static int acpi_pci_irq_add_entry(acpi_handle handle, struct pci_bus *bus,
* 1=INTA, 2=INTB. We use the PCI encoding throughout, so convert
* it here.
*/
* 1=INTA, 2=INTB. We use the PCI encoding throughout, so convert
* it here.
*/
- entry->id.segment =
pci_domain_nr(bus)
;
- entry->id.bus = bus
->number
;
+ entry->id.segment =
segment
;
+ entry->id.bus = bus;
entry->id.device = (prt->address >> 16) & 0xFFFF;
entry->pin = prt->pin + 1;
entry->id.device = (prt->address >> 16) & 0xFFFF;
entry->pin = prt->pin + 1;
@@
-244,7
+244,7
@@
static int acpi_pci_irq_add_entry(acpi_handle handle, struct pci_bus *bus,
return 0;
}
return 0;
}
-int acpi_pci_irq_add_prt(acpi_handle handle,
struct pci_bus *
bus)
+int acpi_pci_irq_add_prt(acpi_handle handle,
int segment, int
bus)
{
acpi_status status;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
{
acpi_status status;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@
-273,7
+273,7
@@
int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus)
entry = buffer.pointer;
while (entry && (entry->length > 0)) {
entry = buffer.pointer;
while (entry && (entry->length > 0)) {
- acpi_pci_irq_add_entry(handle, bus, entry);
+ acpi_pci_irq_add_entry(handle,
segment,
bus, entry);
entry = (struct acpi_pci_routing_table *)
((unsigned long)entry + entry->length);
}
entry = (struct acpi_pci_routing_table *)
((unsigned long)entry + entry->length);
}
@@
-282,17
+282,16
@@
int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus)
return 0;
}
return 0;
}
-void acpi_pci_irq_del_prt(
struct pci_bus *
bus)
+void acpi_pci_irq_del_prt(
int segment, int
bus)
{
struct acpi_prt_entry *entry, *tmp;
printk(KERN_DEBUG
"ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",
{
struct acpi_prt_entry *entry, *tmp;
printk(KERN_DEBUG
"ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",
-
pci_domain_nr(bus), bus->number
);
+
segment, bus
);
spin_lock(&acpi_prt_lock);
list_for_each_entry_safe(entry, tmp, &acpi_prt_list, list) {
spin_lock(&acpi_prt_lock);
list_for_each_entry_safe(entry, tmp, &acpi_prt_list, list) {
- if (pci_domain_nr(bus) == entry->id.segment
- && bus->number == entry->id.bus) {
+ if (segment == entry->id.segment && bus == entry->id.bus) {
list_del(&entry->list);
kfree(entry);
}
list_del(&entry->list);
kfree(entry);
}