diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 04:59:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-22 19:08:57 -0400 |
commit | 9cfb5c05fee914cc65d4706801f6bc424082b5f5 (patch) | |
tree | a71d33f1c89841b4e848546c0dedd9b880f473f7 /drivers/tty/serial/crisv10.c | |
parent | 94abc56f4d90f289ea32a0a11d3577fcd8cb28fb (diff) |
TTY: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial/crisv10.c')
-rw-r--r-- | drivers/tty/serial/crisv10.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c index a931524629f9..b7435043f2fe 100644 --- a/drivers/tty/serial/crisv10.c +++ b/drivers/tty/serial/crisv10.c | |||
@@ -258,7 +258,7 @@ static struct e100_serial rs_table[] = { | |||
258 | .dma_out_enabled = 1, | 258 | .dma_out_enabled = 1, |
259 | .dma_out_nbr = SER0_TX_DMA_NBR, | 259 | .dma_out_nbr = SER0_TX_DMA_NBR, |
260 | .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR, | 260 | .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR, |
261 | .dma_out_irq_flags = IRQF_DISABLED, | 261 | .dma_out_irq_flags = 0, |
262 | .dma_out_irq_description = "serial 0 dma tr", | 262 | .dma_out_irq_description = "serial 0 dma tr", |
263 | #else | 263 | #else |
264 | .dma_out_enabled = 0, | 264 | .dma_out_enabled = 0, |
@@ -271,7 +271,7 @@ static struct e100_serial rs_table[] = { | |||
271 | .dma_in_enabled = 1, | 271 | .dma_in_enabled = 1, |
272 | .dma_in_nbr = SER0_RX_DMA_NBR, | 272 | .dma_in_nbr = SER0_RX_DMA_NBR, |
273 | .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR, | 273 | .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR, |
274 | .dma_in_irq_flags = IRQF_DISABLED, | 274 | .dma_in_irq_flags = 0, |
275 | .dma_in_irq_description = "serial 0 dma rec", | 275 | .dma_in_irq_description = "serial 0 dma rec", |
276 | #else | 276 | #else |
277 | .dma_in_enabled = 0, | 277 | .dma_in_enabled = 0, |
@@ -313,7 +313,7 @@ static struct e100_serial rs_table[] = { | |||
313 | .dma_out_enabled = 1, | 313 | .dma_out_enabled = 1, |
314 | .dma_out_nbr = SER1_TX_DMA_NBR, | 314 | .dma_out_nbr = SER1_TX_DMA_NBR, |
315 | .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR, | 315 | .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR, |
316 | .dma_out_irq_flags = IRQF_DISABLED, | 316 | .dma_out_irq_flags = 0, |
317 | .dma_out_irq_description = "serial 1 dma tr", | 317 | .dma_out_irq_description = "serial 1 dma tr", |
318 | #else | 318 | #else |
319 | .dma_out_enabled = 0, | 319 | .dma_out_enabled = 0, |
@@ -326,7 +326,7 @@ static struct e100_serial rs_table[] = { | |||
326 | .dma_in_enabled = 1, | 326 | .dma_in_enabled = 1, |
327 | .dma_in_nbr = SER1_RX_DMA_NBR, | 327 | .dma_in_nbr = SER1_RX_DMA_NBR, |
328 | .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR, | 328 | .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR, |
329 | .dma_in_irq_flags = IRQF_DISABLED, | 329 | .dma_in_irq_flags = 0, |
330 | .dma_in_irq_description = "serial 1 dma rec", | 330 | .dma_in_irq_description = "serial 1 dma rec", |
331 | #else | 331 | #else |
332 | .dma_in_enabled = 0, | 332 | .dma_in_enabled = 0, |
@@ -369,7 +369,7 @@ static struct e100_serial rs_table[] = { | |||
369 | .dma_out_enabled = 1, | 369 | .dma_out_enabled = 1, |
370 | .dma_out_nbr = SER2_TX_DMA_NBR, | 370 | .dma_out_nbr = SER2_TX_DMA_NBR, |
371 | .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR, | 371 | .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR, |
372 | .dma_out_irq_flags = IRQF_DISABLED, | 372 | .dma_out_irq_flags = 0, |
373 | .dma_out_irq_description = "serial 2 dma tr", | 373 | .dma_out_irq_description = "serial 2 dma tr", |
374 | #else | 374 | #else |
375 | .dma_out_enabled = 0, | 375 | .dma_out_enabled = 0, |
@@ -382,7 +382,7 @@ static struct e100_serial rs_table[] = { | |||
382 | .dma_in_enabled = 1, | 382 | .dma_in_enabled = 1, |
383 | .dma_in_nbr = SER2_RX_DMA_NBR, | 383 | .dma_in_nbr = SER2_RX_DMA_NBR, |
384 | .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR, | 384 | .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR, |
385 | .dma_in_irq_flags = IRQF_DISABLED, | 385 | .dma_in_irq_flags = 0, |
386 | .dma_in_irq_description = "serial 2 dma rec", | 386 | .dma_in_irq_description = "serial 2 dma rec", |
387 | #else | 387 | #else |
388 | .dma_in_enabled = 0, | 388 | .dma_in_enabled = 0, |
@@ -423,7 +423,7 @@ static struct e100_serial rs_table[] = { | |||
423 | .dma_out_enabled = 1, | 423 | .dma_out_enabled = 1, |
424 | .dma_out_nbr = SER3_TX_DMA_NBR, | 424 | .dma_out_nbr = SER3_TX_DMA_NBR, |
425 | .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR, | 425 | .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR, |
426 | .dma_out_irq_flags = IRQF_DISABLED, | 426 | .dma_out_irq_flags = 0, |
427 | .dma_out_irq_description = "serial 3 dma tr", | 427 | .dma_out_irq_description = "serial 3 dma tr", |
428 | #else | 428 | #else |
429 | .dma_out_enabled = 0, | 429 | .dma_out_enabled = 0, |
@@ -436,7 +436,7 @@ static struct e100_serial rs_table[] = { | |||
436 | .dma_in_enabled = 1, | 436 | .dma_in_enabled = 1, |
437 | .dma_in_nbr = SER3_RX_DMA_NBR, | 437 | .dma_in_nbr = SER3_RX_DMA_NBR, |
438 | .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR, | 438 | .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR, |
439 | .dma_in_irq_flags = IRQF_DISABLED, | 439 | .dma_in_irq_flags = 0, |
440 | .dma_in_irq_description = "serial 3 dma rec", | 440 | .dma_in_irq_description = "serial 3 dma rec", |
441 | #else | 441 | #else |
442 | .dma_in_enabled = 0, | 442 | .dma_in_enabled = 0, |
@@ -4558,7 +4558,7 @@ static int __init rs_init(void) | |||
4558 | /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ | 4558 | /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ |
4559 | 4559 | ||
4560 | if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, | 4560 | if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, |
4561 | IRQF_SHARED | IRQF_DISABLED, "serial ", driver)) | 4561 | IRQF_SHARED, "serial ", driver)) |
4562 | panic("%s: Failed to request irq8", __func__); | 4562 | panic("%s: Failed to request irq8", __func__); |
4563 | 4563 | ||
4564 | #endif | 4564 | #endif |