diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-footbridge/dc21285.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index 133086019e3e..3ffa54841ec5 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c | |||
| @@ -287,6 +287,9 @@ struct pci_bus * __init dc21285_scan_bus(int nr, struct pci_sys_data *sys) | |||
| 287 | return pci_scan_bus(0, &dc21285_ops, sys); | 287 | return pci_scan_bus(0, &dc21285_ops, sys); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | #define dc21285_request_irq(_a, _b, _c, _d, _e) \ | ||
| 291 | WARN_ON(request_irq(_a, _b, _c, _d, _e) < 0) | ||
| 292 | |||
| 290 | void __init dc21285_preinit(void) | 293 | void __init dc21285_preinit(void) |
| 291 | { | 294 | { |
| 292 | unsigned int mem_size, mem_mask; | 295 | unsigned int mem_size, mem_mask; |
| @@ -335,16 +338,16 @@ void __init dc21285_preinit(void) | |||
| 335 | /* | 338 | /* |
| 336 | * We don't care if these fail. | 339 | * We don't care if these fail. |
| 337 | */ | 340 | */ |
| 338 | request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED, | 341 | dc21285_request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED, |
| 339 | "PCI system error", &serr_timer); | 342 | "PCI system error", &serr_timer); |
| 340 | request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED, | 343 | dc21285_request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED, |
| 341 | "PCI parity error", &perr_timer); | 344 | "PCI parity error", &perr_timer); |
| 342 | request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED, | 345 | dc21285_request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED, |
| 343 | "PCI abort", NULL); | 346 | "PCI abort", NULL); |
| 344 | request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED, | 347 | dc21285_request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED, |
| 345 | "Discard timer", NULL); | 348 | "Discard timer", NULL); |
| 346 | request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED, | 349 | dc21285_request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED, |
| 347 | "PCI data parity", NULL); | 350 | "PCI data parity", NULL); |
| 348 | 351 | ||
| 349 | if (cfn_mode) { | 352 | if (cfn_mode) { |
| 350 | static struct resource csrio; | 353 | static struct resource csrio; |