diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-07 12:30:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-07 12:30:41 -0700 |
| commit | f9db97d751870cbffc85f4aa0d8aca8a79432691 (patch) | |
| tree | 486315ccf50ea5c5c85a5c67d1bfdd80db5d60f9 /drivers | |
| parent | 12782fbe0f77dcc36c48de8b0ab36d336620a3e7 (diff) | |
| parent | 106c90922e1e0cd5fcbb34be8ebbb3e8a8e71909 (diff) | |
| download | linux-f9db97d751870cbffc85f4aa0d8aca8a79432691.tar.bz2 | |
Merge branch 'parisc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Some cleanups in arch_rw locking functions, improved interrupt
handling in arch spinlocks, coversions to request_irq() and syscall
table generation cleanups"
* 'parisc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: remove nargs from __SYSCALL
parisc: Refactor alternative code to accept multiple conditions
parisc: Rework arch_rw locking functions
parisc: Improve interrupt handling in arch_spin_lock_flags()
parisc: Replace setup_irq() by request_irq()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/eisa.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 9d00a24277aa..f96e5eaee87e 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c @@ -243,11 +243,6 @@ static irqreturn_t dummy_irq2_handler(int _, void *dev) return IRQ_HANDLED; } -static struct irqaction irq2_action = { - .handler = dummy_irq2_handler, - .name = "cascade", -}; - static void init_eisa_pic(void) { unsigned long flags; @@ -335,7 +330,8 @@ static int __init eisa_probe(struct parisc_device *dev) } /* Reserve IRQ2 */ - setup_irq(2, &irq2_action); + if (request_irq(2, dummy_irq2_handler, 0, "cascade", NULL)) + pr_err("Failed to request irq 2 (cascade)\n"); for (i = 0; i < 16; i++) { irq_set_chip_and_handler(i, &eisa_interrupt_type, handle_simple_irq); |