diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2005-06-13 14:27:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 18:04:39 -0400 |
commit | 7b404b3459db1326bbdc7085edb1f58b98da5826 (patch) | |
tree | d1729e7a3cf040e5ffee695735dca49b2a075d76 /arch/ia64/pci | |
parent | 0393eed5c3220c9c3823a09a2d02329b8ff08b45 (diff) |
[IA64] remove "pci=routeirq" option
Remove "pci=routeirq" option for ia64. This was a workaround
after ACPI IRQ routing was changed from "all at boot for everything
in _PRT" to "do it when the device is enabled" in case there were
drivers that didn't use pci_enable_device().
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r-- | arch/ia64/pci/pci.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 88641e5095b..e3fc4edea11 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -33,8 +33,6 @@ | |||
33 | #include <asm/hw_irq.h> | 33 | #include <asm/hw_irq.h> |
34 | 34 | ||
35 | 35 | ||
36 | static int pci_routeirq; | ||
37 | |||
38 | /* | 36 | /* |
39 | * Low-level SAL-based PCI configuration access functions. Note that SAL | 37 | * Low-level SAL-based PCI configuration access functions. Note that SAL |
40 | * calls are already serialized (via sal_lock), so we don't need another | 38 | * calls are already serialized (via sal_lock), so we don't need another |
@@ -139,24 +137,8 @@ static void acpi_map_iosapics(void) | |||
139 | static int __init | 137 | static int __init |
140 | pci_acpi_init (void) | 138 | pci_acpi_init (void) |
141 | { | 139 | { |
142 | struct pci_dev *dev = NULL; | ||
143 | |||
144 | printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); | ||
145 | |||
146 | acpi_map_iosapics(); | 140 | acpi_map_iosapics(); |
147 | 141 | ||
148 | if (pci_routeirq) { | ||
149 | /* | ||
150 | * PCI IRQ routing is set up by pci_enable_device(), but we | ||
151 | * also do it here in case there are still broken drivers that | ||
152 | * don't use pci_enable_device(). | ||
153 | */ | ||
154 | printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n"); | ||
155 | for_each_pci_dev(dev) | ||
156 | acpi_pci_irq_enable(dev); | ||
157 | } else | ||
158 | printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n"); | ||
159 | |||
160 | return 0; | 142 | return 0; |
161 | } | 143 | } |
162 | 144 | ||
@@ -500,8 +482,6 @@ pcibios_align_resource (void *data, struct resource *res, | |||
500 | char * __init | 482 | char * __init |
501 | pcibios_setup (char *str) | 483 | pcibios_setup (char *str) |
502 | { | 484 | { |
503 | if (!strcmp(str, "routeirq")) | ||
504 | pci_routeirq = 1; | ||
505 | return NULL; | 485 | return NULL; |
506 | } | 486 | } |
507 | 487 | ||