Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9cfb5c05fee914cc65d4706801f6bc424082b5f5

Authored by Yong Zhang
Committed by Greg Kroah-Hartman
1 parent 94abc56f4d
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 19 changed files with 35 additions and 35 deletions Side-by-side Diff

drivers/tty/amiserial.c
Diff comments   View file @ 9cfb5c0
... ... @@ -2017,7 +2017,7 @@
2017 2017 if (error)
2018 2018 goto fail_unregister;
2019 2019  
2020   - error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED,
  2020 + error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, 0,
2021 2021 "serial RX", state);
2022 2022 if (error)
2023 2023 goto fail_free_irq;
drivers/tty/cyclades.c
Diff comments   View file @ 9cfb5c0
... ... @@ -3367,7 +3367,7 @@
3367 3367  
3368 3368 /* allocate IRQ */
3369 3369 if (request_irq(cy_isa_irq, cyy_interrupt,
3370   - IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {
  3370 + 0, "Cyclom-Y", &cy_card[j])) {
3371 3371 printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "
3372 3372 "could not allocate IRQ#%d.\n",
3373 3373 (unsigned long)cy_isa_address, cy_isa_irq);
drivers/tty/hvc/hvc_irq.c
Diff comments   View file @ 9cfb5c0
... ... @@ -28,7 +28,7 @@
28 28 hp->irq_requested = 0;
29 29 return 0;
30 30 }
31   - rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED,
  31 + rc = request_irq(irq, hvc_handle_interrupt, 0,
32 32 "hvc_console", hp);
33 33 if (!rc)
34 34 hp->irq_requested = 1;
drivers/tty/hvc/hvcs.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1057,7 +1057,7 @@
1057 1057 * the conn was registered and now.
1058 1058 */
1059 1059 if (!(rc = request_irq(irq, &hvcs_handle_interrupt,
1060   - IRQF_DISABLED, "ibmhvcs", hvcsd))) {
  1060 + 0, "ibmhvcs", hvcsd))) {
1061 1061 /*
1062 1062 * It is possible the vty-server was removed after the irq was
1063 1063 * requested but before we have time to enable interrupts.
drivers/tty/hvc/hvsi.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1105,7 +1105,7 @@
1105 1105 struct hvsi_struct *hp = &hvsi_ports[i];
1106 1106 int ret = 1;
1107 1107  
1108   - ret = request_irq(hp->virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp);
  1108 + ret = request_irq(hp->virq, hvsi_interrupt, 0, "hvsi", hp);
1109 1109 if (ret)
1110 1110 printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n",
1111 1111 hp->virq, ret);
drivers/tty/isicom.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1598,7 +1598,7 @@
1598 1598 }
1599 1599  
1600 1600 retval = request_irq(board->irq, isicom_interrupt,
1601   - IRQF_SHARED | IRQF_DISABLED, ISICOM_NAME, board);
  1601 + IRQF_SHARED, ISICOM_NAME, board);
1602 1602 if (retval < 0) {
1603 1603 dev_err(&pdev->dev, "Could not install handler at Irq %d. "
1604 1604 "Card%d will be disabled.\n", board->irq, index + 1);
drivers/tty/serial/68328serial.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1306,7 +1306,7 @@
1306 1306  
1307 1307 if (request_irq(uart_irqs[i],
1308 1308 rs_interrupt,
1309   - IRQF_DISABLED,
  1309 + 0,
1310 1310 "M68328_UART", info))
1311 1311 panic("Unable to attach 68328 serial interrupt\n");
1312 1312 }
drivers/tty/serial/altera_jtaguart.c
Diff comments   View file @ 9cfb5c0
... ... @@ -218,7 +218,7 @@
218 218 unsigned long flags;
219 219 int ret;
220 220  
221   - ret = request_irq(port->irq, altera_jtaguart_interrupt, IRQF_DISABLED,
  221 + ret = request_irq(port->irq, altera_jtaguart_interrupt, 0,
222 222 DRV_NAME, port);
223 223 if (ret) {
224 224 pr_err(DRV_NAME ": unable to attach Altera JTAG UART %d "
drivers/tty/serial/altera_uart.c
Diff comments   View file @ 9cfb5c0
... ... @@ -315,7 +315,7 @@
315 315 return 0;
316 316 }
317 317  
318   - ret = request_irq(port->irq, altera_uart_interrupt, IRQF_DISABLED,
  318 + ret = request_irq(port->irq, altera_uart_interrupt, 0,
319 319 DRV_NAME, port);
320 320 if (ret) {
321 321 pr_err(DRV_NAME ": unable to attach Altera UART %d "
drivers/tty/serial/bfin_sport_uart.c
Diff comments   View file @ 9cfb5c0
... ... @@ -294,7 +294,7 @@
294 294 if (request_irq(gpio_to_irq(up->cts_pin),
295 295 sport_mctrl_cts_int,
296 296 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
297   - IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) {
  297 + 0, "BFIN_SPORT_UART_CTS", up)) {
298 298 up->cts_pin = -1;
299 299 dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n");
300 300 }
drivers/tty/serial/bfin_uart.c
Diff comments   View file @ 9cfb5c0
... ... @@ -667,14 +667,14 @@
667 667 kgdboc_break_enabled = 0;
668 668 else {
669 669 # endif
670   - if (request_irq(uart->rx_irq, bfin_serial_rx_int, IRQF_DISABLED,
  670 + if (request_irq(uart->rx_irq, bfin_serial_rx_int, 0,
671 671 "BFIN_UART_RX", uart)) {
672 672 printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
673 673 return -EBUSY;
674 674 }
675 675  
676 676 if (request_irq
677   - (uart->tx_irq, bfin_serial_tx_int, IRQF_DISABLED,
  677 + (uart->tx_irq, bfin_serial_tx_int, 0,
678 678 "BFIN_UART_TX", uart)) {
679 679 printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
680 680 free_irq(uart->rx_irq, uart);
... ... @@ -734,7 +734,7 @@
734 734 if (request_irq(gpio_to_irq(uart->cts_pin),
735 735 bfin_serial_mctrl_cts_int,
736 736 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
737   - IRQF_DISABLED, "BFIN_UART_CTS", uart)) {
  737 + 0, "BFIN_UART_CTS", uart)) {
738 738 uart->cts_pin = -1;
739 739 pr_info("Unable to attach BlackFin UART CTS interrupt. So, disable it.\n");
740 740 }
... ... @@ -745,7 +745,7 @@
745 745 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
746 746 if (uart->cts_pin >= 0 && request_irq(uart->status_irq,
747 747 bfin_serial_mctrl_cts_int,
748   - IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) {
  748 + 0, "BFIN_UART_MODEM_STATUS", uart)) {
749 749 uart->cts_pin = -1;
750 750 pr_info("Unable to attach BlackFin UART Modem Status interrupt.\n");
751 751 }
drivers/tty/serial/crisv10.c
Diff comments   View file @ 9cfb5c0
... ... @@ -258,7 +258,7 @@
258 258 .dma_out_enabled = 1,
259 259 .dma_out_nbr = SER0_TX_DMA_NBR,
260 260 .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR,
261   - .dma_out_irq_flags = IRQF_DISABLED,
  261 + .dma_out_irq_flags = 0,
262 262 .dma_out_irq_description = "serial 0 dma tr",
263 263 #else
264 264 .dma_out_enabled = 0,
... ... @@ -271,7 +271,7 @@
271 271 .dma_in_enabled = 1,
272 272 .dma_in_nbr = SER0_RX_DMA_NBR,
273 273 .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR,
274   - .dma_in_irq_flags = IRQF_DISABLED,
  274 + .dma_in_irq_flags = 0,
275 275 .dma_in_irq_description = "serial 0 dma rec",
276 276 #else
277 277 .dma_in_enabled = 0,
... ... @@ -313,7 +313,7 @@
313 313 .dma_out_enabled = 1,
314 314 .dma_out_nbr = SER1_TX_DMA_NBR,
315 315 .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR,
316   - .dma_out_irq_flags = IRQF_DISABLED,
  316 + .dma_out_irq_flags = 0,
317 317 .dma_out_irq_description = "serial 1 dma tr",
318 318 #else
319 319 .dma_out_enabled = 0,
... ... @@ -326,7 +326,7 @@
326 326 .dma_in_enabled = 1,
327 327 .dma_in_nbr = SER1_RX_DMA_NBR,
328 328 .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR,
329   - .dma_in_irq_flags = IRQF_DISABLED,
  329 + .dma_in_irq_flags = 0,
330 330 .dma_in_irq_description = "serial 1 dma rec",
331 331 #else
332 332 .dma_in_enabled = 0,
... ... @@ -369,7 +369,7 @@
369 369 .dma_out_enabled = 1,
370 370 .dma_out_nbr = SER2_TX_DMA_NBR,
371 371 .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR,
372   - .dma_out_irq_flags = IRQF_DISABLED,
  372 + .dma_out_irq_flags = 0,
373 373 .dma_out_irq_description = "serial 2 dma tr",
374 374 #else
375 375 .dma_out_enabled = 0,
... ... @@ -382,7 +382,7 @@
382 382 .dma_in_enabled = 1,
383 383 .dma_in_nbr = SER2_RX_DMA_NBR,
384 384 .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR,
385   - .dma_in_irq_flags = IRQF_DISABLED,
  385 + .dma_in_irq_flags = 0,
386 386 .dma_in_irq_description = "serial 2 dma rec",
387 387 #else
388 388 .dma_in_enabled = 0,
... ... @@ -423,7 +423,7 @@
423 423 .dma_out_enabled = 1,
424 424 .dma_out_nbr = SER3_TX_DMA_NBR,
425 425 .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR,
426   - .dma_out_irq_flags = IRQF_DISABLED,
  426 + .dma_out_irq_flags = 0,
427 427 .dma_out_irq_description = "serial 3 dma tr",
428 428 #else
429 429 .dma_out_enabled = 0,
... ... @@ -436,7 +436,7 @@
436 436 .dma_in_enabled = 1,
437 437 .dma_in_nbr = SER3_RX_DMA_NBR,
438 438 .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR,
439   - .dma_in_irq_flags = IRQF_DISABLED,
  439 + .dma_in_irq_flags = 0,
440 440 .dma_in_irq_description = "serial 3 dma rec",
441 441 #else
442 442 .dma_in_enabled = 0,
... ... @@ -4558,7 +4558,7 @@
4558 4558 /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */
4559 4559  
4560 4560 if (request_irq(SERIAL_IRQ_NBR, ser_interrupt,
4561   - IRQF_SHARED | IRQF_DISABLED, "serial ", driver))
  4561 + IRQF_SHARED, "serial ", driver))
4562 4562 panic("%s: Failed to request irq8", __func__);
4563 4563  
4564 4564 #endif
drivers/tty/serial/icom.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1554,7 +1554,7 @@
1554 1554  
1555 1555 /* save off irq and request irq line */
1556 1556 if ( (retval = request_irq(dev->irq, icom_interrupt,
1557   - IRQF_DISABLED | IRQF_SHARED, ICOM_DRIVER_NAME,
  1557 + IRQF_SHARED, ICOM_DRIVER_NAME,
1558 1558 (void *) icom_adapter))) {
1559 1559 goto probe_exit2;
1560 1560 }
drivers/tty/serial/lantiq.c
Diff comments   View file @ 9cfb5c0
... ... @@ -338,21 +338,21 @@
338 338 ASCCON_ROEN, port->membase + LTQ_ASC_CON);
339 339  
340 340 retval = request_irq(ltq_port->tx_irq, lqasc_tx_int,
341   - IRQF_DISABLED, "asc_tx", port);
  341 + 0, "asc_tx", port);
342 342 if (retval) {
343 343 pr_err("failed to request lqasc_tx_int\n");
344 344 return retval;
345 345 }
346 346  
347 347 retval = request_irq(ltq_port->rx_irq, lqasc_rx_int,
348   - IRQF_DISABLED, "asc_rx", port);
  348 + 0, "asc_rx", port);
349 349 if (retval) {
350 350 pr_err("failed to request lqasc_rx_int\n");
351 351 goto err1;
352 352 }
353 353  
354 354 retval = request_irq(ltq_port->err_irq, lqasc_err_int,
355   - IRQF_DISABLED, "asc_err", port);
  355 + 0, "asc_err", port);
356 356 if (retval) {
357 357 pr_err("failed to request lqasc_err_int\n");
358 358 goto err2;
drivers/tty/serial/mcf.c
Diff comments   View file @ 9cfb5c0
... ... @@ -380,7 +380,7 @@
380 380 /* Clear mask, so no surprise interrupts. */
381 381 writeb(0, port->membase + MCFUART_UIMR);
382 382  
383   - if (request_irq(port->irq, mcf_interrupt, IRQF_DISABLED, "UART", port))
  383 + if (request_irq(port->irq, mcf_interrupt, 0, "UART", port))
384 384 printk(KERN_ERR "MCF: unable to attach ColdFire UART %d "
385 385 "interrupt vector=%d\n", port->line, port->irq);
386 386 }
drivers/tty/serial/mpc52xx_uart.c
Diff comments   View file @ 9cfb5c0
... ... @@ -274,7 +274,7 @@
274 274  
275 275 static void mpc52xx_psc_get_irq(struct uart_port *port, struct device_node *np)
276 276 {
277   - port->irqflags = IRQF_DISABLED;
  277 + port->irqflags = 0;
278 278 port->irq = irq_of_parse_and_map(np, 0);
279 279 }
280 280  
drivers/tty/serial/serial_ks8695.c
Diff comments   View file @ 9cfb5c0
... ... @@ -337,19 +337,19 @@
337 337 /*
338 338 * Allocate the IRQ
339 339 */
340   - retval = request_irq(KS8695_IRQ_UART_TX, ks8695uart_tx_chars, IRQF_DISABLED, "UART TX", port);
  340 + retval = request_irq(KS8695_IRQ_UART_TX, ks8695uart_tx_chars, 0, "UART TX", port);
341 341 if (retval)
342 342 goto err_tx;
343 343  
344   - retval = request_irq(KS8695_IRQ_UART_RX, ks8695uart_rx_chars, IRQF_DISABLED, "UART RX", port);
  344 + retval = request_irq(KS8695_IRQ_UART_RX, ks8695uart_rx_chars, 0, "UART RX", port);
345 345 if (retval)
346 346 goto err_rx;
347 347  
348   - retval = request_irq(KS8695_IRQ_UART_LINE_STATUS, ks8695uart_rx_chars, IRQF_DISABLED, "UART LineStatus", port);
  348 + retval = request_irq(KS8695_IRQ_UART_LINE_STATUS, ks8695uart_rx_chars, 0, "UART LineStatus", port);
349 349 if (retval)
350 350 goto err_ls;
351 351  
352   - retval = request_irq(KS8695_IRQ_UART_MODEM_STATUS, ks8695uart_modem_status, IRQF_DISABLED, "UART ModemStatus", port);
  352 + retval = request_irq(KS8695_IRQ_UART_MODEM_STATUS, ks8695uart_modem_status, 0, "UART ModemStatus", port);
353 353 if (retval)
354 354 goto err_ms;
355 355  
drivers/tty/serial/sh-sci.c
Diff comments   View file @ 9cfb5c0
... ... @@ -1961,7 +1961,7 @@
1961 1961 * For the muxed case there's nothing more to do.
1962 1962 */
1963 1963 port->irq = p->irqs[SCIx_RXI_IRQ];
1964   - port->irqflags = IRQF_DISABLED;
  1964 + port->irqflags = 0;
1965 1965  
1966 1966 port->serial_in = sci_serial_in;
1967 1967 port->serial_out = sci_serial_out;
drivers/tty/serial/sn_console.c
Diff comments   View file @ 9cfb5c0
... ... @@ -738,7 +738,7 @@
738 738 DPRINTF("sn_console: switching to interrupt driven console\n");
739 739  
740 740 if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
741   - IRQF_DISABLED | IRQF_SHARED,
  741 + IRQF_SHARED,
742 742 "SAL console driver", port) >= 0) {
743 743 spin_lock_irqsave(&port->sc_port.lock, flags);
744 744 port->sc_port.irq = SGI_UART_VECTOR;