diff options
| -rw-r--r-- | drivers/acpi/pci_irq.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 03d528e02c2..cba8d4dc56a 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
| @@ -149,8 +149,8 @@ static struct prt_quirk prt_quirks[] = { | |||
| 149 | "\\_SB_.PCI0.LNK3"}, | 149 | "\\_SB_.PCI0.LNK3"}, |
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | static void | 152 | static void do_prt_fixups(struct acpi_prt_entry *entry, |
| 153 | do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt) | 153 | struct acpi_pci_routing_table *prt) |
| 154 | { | 154 | { |
| 155 | int i; | 155 | int i; |
| 156 | struct prt_quirk *quirk; | 156 | struct prt_quirk *quirk; |
| @@ -180,9 +180,8 @@ do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt) | |||
| 180 | } | 180 | } |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | static int | 183 | static int acpi_pci_irq_add_entry(acpi_handle handle, int segment, int bus, |
| 184 | acpi_pci_irq_add_entry(acpi_handle handle, | 184 | struct acpi_pci_routing_table *prt) |
| 185 | int segment, int bus, struct acpi_pci_routing_table *prt) | ||
| 186 | { | 185 | { |
| 187 | struct acpi_prt_entry *entry; | 186 | struct acpi_prt_entry *entry; |
| 188 | 187 | ||
| @@ -299,8 +298,7 @@ void acpi_pci_irq_del_prt(int segment, int bus) | |||
| 299 | /* -------------------------------------------------------------------------- | 298 | /* -------------------------------------------------------------------------- |
| 300 | PCI Interrupt Routing Support | 299 | PCI Interrupt Routing Support |
| 301 | -------------------------------------------------------------------------- */ | 300 | -------------------------------------------------------------------------- */ |
| 302 | static struct acpi_prt_entry * | 301 | static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) |
| 303 | acpi_pci_irq_lookup(struct pci_dev *dev, int pin) | ||
| 304 | { | 302 | { |
| 305 | struct acpi_prt_entry *entry; | 303 | struct acpi_prt_entry *entry; |
| 306 | struct pci_dev *bridge; | 304 | struct pci_dev *bridge; |
| @@ -351,24 +349,17 @@ acpi_pci_irq_lookup(struct pci_dev *dev, int pin) | |||
| 351 | return NULL; | 349 | return NULL; |
| 352 | } | 350 | } |
| 353 | 351 | ||
| 354 | /* | ||
| 355 | * acpi_pci_irq_enable | ||
| 356 | * success: return 0 | ||
| 357 | * failure: return < 0 | ||
| 358 | */ | ||
| 359 | |||
| 360 | int acpi_pci_irq_enable(struct pci_dev *dev) | 352 | int acpi_pci_irq_enable(struct pci_dev *dev) |
| 361 | { | 353 | { |
| 362 | struct acpi_prt_entry *entry; | 354 | struct acpi_prt_entry *entry; |
| 363 | int gsi = 0; | 355 | int gsi; |
| 364 | u8 pin = 0; | 356 | u8 pin; |
| 365 | int triggering = ACPI_LEVEL_SENSITIVE; | 357 | int triggering = ACPI_LEVEL_SENSITIVE; |
| 366 | int polarity = ACPI_ACTIVE_LOW; | 358 | int polarity = ACPI_ACTIVE_LOW; |
| 367 | char *link = NULL; | 359 | char *link = NULL; |
| 368 | char link_desc[16]; | 360 | char link_desc[16]; |
| 369 | int rc; | 361 | int rc; |
| 370 | 362 | ||
| 371 | |||
| 372 | pin = dev->pin; | 363 | pin = dev->pin; |
| 373 | if (!pin) { | 364 | if (!pin) { |
| 374 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 365 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| @@ -446,9 +437,8 @@ void __attribute__ ((weak)) acpi_unregister_gsi(u32 i) | |||
| 446 | void acpi_pci_irq_disable(struct pci_dev *dev) | 437 | void acpi_pci_irq_disable(struct pci_dev *dev) |
| 447 | { | 438 | { |
| 448 | struct acpi_prt_entry *entry; | 439 | struct acpi_prt_entry *entry; |
| 449 | int gsi = 0; | 440 | int gsi; |
| 450 | u8 pin = 0; | 441 | u8 pin; |
| 451 | |||
| 452 | 442 | ||
| 453 | pin = dev->pin; | 443 | pin = dev->pin; |
| 454 | if (!pin) | 444 | if (!pin) |
