diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250.c | 4 | ||||
-rw-r--r-- | drivers/serial/at91_serial.c | 2 | ||||
-rw-r--r-- | drivers/serial/crisv10.c | 22 | ||||
-rw-r--r-- | drivers/serial/dz.c | 2 | ||||
-rw-r--r-- | drivers/serial/icom.c | 2 | ||||
-rw-r--r-- | drivers/serial/imx.c | 2 | ||||
-rw-r--r-- | drivers/serial/ioc4_serial.c | 2 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_driver.c | 2 | ||||
-rw-r--r-- | drivers/serial/m32r_sio.c | 2 | ||||
-rw-r--r-- | drivers/serial/mcfserial.c | 2 | ||||
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 | ||||
-rw-r--r-- | drivers/serial/mpsc.c | 2 | ||||
-rw-r--r-- | drivers/serial/pmac_zilog.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_txx9.c | 2 | ||||
-rw-r--r-- | drivers/serial/sh-sci.c | 4 | ||||
-rw-r--r-- | drivers/serial/sn_console.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsab.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsu.c | 4 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 2 | ||||
-rw-r--r-- | drivers/serial/v850e_uart.c | 4 |
20 files changed, 34 insertions, 34 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 9c5d36f50140..0995430e4cf1 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | /* | 49 | /* |
50 | * Configuration: | 50 | * Configuration: |
51 | * share_irqs - whether we pass SA_SHIRQ to request_irq(). This option | 51 | * share_irqs - whether we pass IRQF_SHARED to request_irq(). This option |
52 | * is unsafe when used on edge-triggered interrupts. | 52 | * is unsafe when used on edge-triggered interrupts. |
53 | */ | 53 | */ |
54 | static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; | 54 | static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; |
@@ -1400,7 +1400,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up) | |||
1400 | static int serial_link_irq_chain(struct uart_8250_port *up) | 1400 | static int serial_link_irq_chain(struct uart_8250_port *up) |
1401 | { | 1401 | { |
1402 | struct irq_info *i = irq_lists + up->port.irq; | 1402 | struct irq_info *i = irq_lists + up->port.irq; |
1403 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; | 1403 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0; |
1404 | 1404 | ||
1405 | spin_lock_irq(&i->lock); | 1405 | spin_lock_irq(&i->lock); |
1406 | 1406 | ||
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c index 7b3b3f3d5101..a7d664383dae 100644 --- a/drivers/serial/at91_serial.c +++ b/drivers/serial/at91_serial.c | |||
@@ -387,7 +387,7 @@ static int at91_startup(struct uart_port *port) | |||
387 | /* | 387 | /* |
388 | * Allocate the IRQ | 388 | * Allocate the IRQ |
389 | */ | 389 | */ |
390 | retval = request_irq(port->irq, at91_interrupt, SA_SHIRQ, "at91_serial", port); | 390 | retval = request_irq(port->irq, at91_interrupt, IRQF_SHARED, "at91_serial", port); |
391 | if (retval) { | 391 | if (retval) { |
392 | printk("at91_serial: at91_startup - Can't get irq\n"); | 392 | printk("at91_serial: at91_startup - Can't get irq\n"); |
393 | return retval; | 393 | return retval; |
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 901be3483455..cabd048c8636 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
@@ -415,7 +415,7 @@ | |||
415 | * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when | 415 | * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when |
416 | * closing the last filehandle, NASTY!. | 416 | * closing the last filehandle, NASTY!. |
417 | * Added break generation, not tested though! | 417 | * Added break generation, not tested though! |
418 | * Use SA_SHIRQ when request_irq() for ser2 and ser3 (shared with) par0 and par1. | 418 | * Use IRQF_SHARED when request_irq() for ser2 and ser3 (shared with) par0 and par1. |
419 | * You can't use them at the same time (yet..), but you can hopefully switch | 419 | * You can't use them at the same time (yet..), but you can hopefully switch |
420 | * between ser2/par0, ser3/par1 with the same kernel config. | 420 | * between ser2/par0, ser3/par1 with the same kernel config. |
421 | * Replaced some magic constants with defines | 421 | * Replaced some magic constants with defines |
@@ -4942,55 +4942,55 @@ rs_init(void) | |||
4942 | /* Not needed in simulator. May only complicate stuff. */ | 4942 | /* Not needed in simulator. May only complicate stuff. */ |
4943 | /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ | 4943 | /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ |
4944 | 4944 | ||
4945 | if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial ", NULL)) | 4945 | if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial ", NULL)) |
4946 | panic("irq8"); | 4946 | panic("irq8"); |
4947 | 4947 | ||
4948 | #ifdef CONFIG_ETRAX_SERIAL_PORT0 | 4948 | #ifdef CONFIG_ETRAX_SERIAL_PORT0 |
4949 | #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT | 4949 | #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT |
4950 | if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 0 dma tr", NULL)) | 4950 | if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 0 dma tr", NULL)) |
4951 | panic("irq22"); | 4951 | panic("irq22"); |
4952 | #endif | 4952 | #endif |
4953 | #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN | 4953 | #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN |
4954 | if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 0 dma rec", NULL)) | 4954 | if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 0 dma rec", NULL)) |
4955 | panic("irq23"); | 4955 | panic("irq23"); |
4956 | #endif | 4956 | #endif |
4957 | #endif | 4957 | #endif |
4958 | 4958 | ||
4959 | #ifdef CONFIG_ETRAX_SERIAL_PORT1 | 4959 | #ifdef CONFIG_ETRAX_SERIAL_PORT1 |
4960 | #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT | 4960 | #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT |
4961 | if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 1 dma tr", NULL)) | 4961 | if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 1 dma tr", NULL)) |
4962 | panic("irq24"); | 4962 | panic("irq24"); |
4963 | #endif | 4963 | #endif |
4964 | #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN | 4964 | #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN |
4965 | if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 1 dma rec", NULL)) | 4965 | if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 1 dma rec", NULL)) |
4966 | panic("irq25"); | 4966 | panic("irq25"); |
4967 | #endif | 4967 | #endif |
4968 | #endif | 4968 | #endif |
4969 | #ifdef CONFIG_ETRAX_SERIAL_PORT2 | 4969 | #ifdef CONFIG_ETRAX_SERIAL_PORT2 |
4970 | /* DMA Shared with par0 (and SCSI0 and ATA) */ | 4970 | /* DMA Shared with par0 (and SCSI0 and ATA) */ |
4971 | #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT | 4971 | #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT |
4972 | if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma tr", NULL)) | 4972 | if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma tr", NULL)) |
4973 | panic("irq18"); | 4973 | panic("irq18"); |
4974 | #endif | 4974 | #endif |
4975 | #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN | 4975 | #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN |
4976 | if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma rec", NULL)) | 4976 | if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma rec", NULL)) |
4977 | panic("irq19"); | 4977 | panic("irq19"); |
4978 | #endif | 4978 | #endif |
4979 | #endif | 4979 | #endif |
4980 | #ifdef CONFIG_ETRAX_SERIAL_PORT3 | 4980 | #ifdef CONFIG_ETRAX_SERIAL_PORT3 |
4981 | /* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */ | 4981 | /* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */ |
4982 | #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT | 4982 | #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT |
4983 | if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma tr", NULL)) | 4983 | if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma tr", NULL)) |
4984 | panic("irq20"); | 4984 | panic("irq20"); |
4985 | #endif | 4985 | #endif |
4986 | #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN | 4986 | #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN |
4987 | if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma rec", NULL)) | 4987 | if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma rec", NULL)) |
4988 | panic("irq21"); | 4988 | panic("irq21"); |
4989 | #endif | 4989 | #endif |
4990 | #endif | 4990 | #endif |
4991 | 4991 | ||
4992 | #ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST | 4992 | #ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST |
4993 | if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, SA_SHIRQ | SA_INTERRUPT, | 4993 | if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, IRQF_SHARED | IRQF_DISABLED, |
4994 | "fast serial dma timeout", NULL)) { | 4994 | "fast serial dma timeout", NULL)) { |
4995 | printk(KERN_CRIT "err: timer1 irq\n"); | 4995 | printk(KERN_CRIT "err: timer1 irq\n"); |
4996 | } | 4996 | } |
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c index ecf824bd2d4e..d119c8296a78 100644 --- a/drivers/serial/dz.c +++ b/drivers/serial/dz.c | |||
@@ -797,7 +797,7 @@ int __init dz_init(void) | |||
797 | restore_flags(flags); | 797 | restore_flags(flags); |
798 | 798 | ||
799 | if (request_irq(dz_ports[0].port.irq, dz_interrupt, | 799 | if (request_irq(dz_ports[0].port.irq, dz_interrupt, |
800 | SA_INTERRUPT, "DZ", &dz_ports[0])) | 800 | IRQF_DISABLED, "DZ", &dz_ports[0])) |
801 | panic("Unable to register DZ interrupt"); | 801 | panic("Unable to register DZ interrupt"); |
802 | 802 | ||
803 | ret = uart_register_driver(&dz_reg); | 803 | ret = uart_register_driver(&dz_reg); |
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index ad1e753cbc53..a3c00a252149 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
@@ -1563,7 +1563,7 @@ static int __devinit icom_probe(struct pci_dev *dev, | |||
1563 | 1563 | ||
1564 | /* save off irq and request irq line */ | 1564 | /* save off irq and request irq line */ |
1565 | if ( (retval = request_irq(dev->irq, icom_interrupt, | 1565 | if ( (retval = request_irq(dev->irq, icom_interrupt, |
1566 | SA_INTERRUPT | SA_SHIRQ, ICOM_DRIVER_NAME, | 1566 | IRQF_DISABLED | IRQF_SHARED, ICOM_DRIVER_NAME, |
1567 | (void *) icom_adapter))) { | 1567 | (void *) icom_adapter))) { |
1568 | goto probe_exit2; | 1568 | goto probe_exit2; |
1569 | } | 1569 | } |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 0b5f39d038b9..4a142d6b8f38 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -404,7 +404,7 @@ static int imx_startup(struct uart_port *port) | |||
404 | if (retval) goto error_out2; | 404 | if (retval) goto error_out2; |
405 | 405 | ||
406 | retval = request_irq(sport->rtsirq, imx_rtsint, | 406 | retval = request_irq(sport->rtsirq, imx_rtsint, |
407 | SA_TRIGGER_FALLING | SA_TRIGGER_RISING, | 407 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, |
408 | DRIVER_NAME, sport); | 408 | DRIVER_NAME, sport); |
409 | if (retval) goto error_out3; | 409 | if (retval) goto error_out3; |
410 | 410 | ||
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 717e47bbd784..576ca1eaa2b6 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
@@ -2855,7 +2855,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd) | |||
2855 | control->ic_soft = soft; | 2855 | control->ic_soft = soft; |
2856 | 2856 | ||
2857 | /* Hook up interrupt handler */ | 2857 | /* Hook up interrupt handler */ |
2858 | if (!request_irq(idd->idd_pdev->irq, ioc4_intr, SA_SHIRQ, | 2858 | if (!request_irq(idd->idd_pdev->irq, ioc4_intr, IRQF_SHARED, |
2859 | "sgi-ioc4serial", soft)) { | 2859 | "sgi-ioc4serial", soft)) { |
2860 | control->ic_irq = idd->idd_pdev->irq; | 2860 | control->ic_irq = idd->idd_pdev->irq; |
2861 | } else { | 2861 | } else { |
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c index b3e1f71be4da..244f63be3a03 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/serial/jsm/jsm_driver.c | |||
@@ -121,7 +121,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
121 | } | 121 | } |
122 | 122 | ||
123 | rc = request_irq(brd->irq, brd->bd_ops->intr, | 123 | rc = request_irq(brd->irq, brd->bd_ops->intr, |
124 | SA_INTERRUPT|SA_SHIRQ, "JSM", brd); | 124 | IRQF_DISABLED|IRQF_SHARED, "JSM", brd); |
125 | if (rc) { | 125 | if (rc) { |
126 | printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq); | 126 | printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq); |
127 | goto out_iounmap; | 127 | goto out_iounmap; |
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index fbaae96f4c93..e7fe4bb46eca 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -542,7 +542,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up) | |||
542 | static int serial_link_irq_chain(struct uart_sio_port *up) | 542 | static int serial_link_irq_chain(struct uart_sio_port *up) |
543 | { | 543 | { |
544 | struct irq_info *i = irq_lists + up->port.irq; | 544 | struct irq_info *i = irq_lists + up->port.irq; |
545 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; | 545 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0; |
546 | 546 | ||
547 | spin_lock_irq(&i->lock); | 547 | spin_lock_irq(&i->lock); |
548 | 548 | ||
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c index 29c0630e3e64..832abd3c4706 100644 --- a/drivers/serial/mcfserial.c +++ b/drivers/serial/mcfserial.c | |||
@@ -1596,7 +1596,7 @@ static void mcfrs_irqinit(struct mcf_serial *info) | |||
1596 | /* Clear mask, so no surprise interrupts. */ | 1596 | /* Clear mask, so no surprise interrupts. */ |
1597 | uartp[MCFUART_UIMR] = 0; | 1597 | uartp[MCFUART_UIMR] = 0; |
1598 | 1598 | ||
1599 | if (request_irq(info->irq, mcfrs_interrupt, SA_INTERRUPT, | 1599 | if (request_irq(info->irq, mcfrs_interrupt, IRQF_DISABLED, |
1600 | "ColdFire UART", NULL)) { | 1600 | "ColdFire UART", NULL)) { |
1601 | printk("MCFRS: Unable to attach ColdFire UART %d interrupt " | 1601 | printk("MCFRS: Unable to attach ColdFire UART %d interrupt " |
1602 | "vector=%d\n", info->line, info->irq); | 1602 | "vector=%d\n", info->line, info->irq); |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 1b8e554f674f..48eb22d3a63e 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -190,7 +190,7 @@ mpc52xx_uart_startup(struct uart_port *port) | |||
190 | 190 | ||
191 | /* Request IRQ */ | 191 | /* Request IRQ */ |
192 | ret = request_irq(port->irq, mpc52xx_uart_int, | 192 | ret = request_irq(port->irq, mpc52xx_uart_int, |
193 | SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port); | 193 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "mpc52xx_psc_uart", port); |
194 | if (ret) | 194 | if (ret) |
195 | return ret; | 195 | return ret; |
196 | 196 | ||
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index 8c498f785e21..63d2a66e563b 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
@@ -1412,7 +1412,7 @@ mpsc_startup(struct uart_port *port) | |||
1412 | 1412 | ||
1413 | /* If irq's are shared, need to set flag */ | 1413 | /* If irq's are shared, need to set flag */ |
1414 | if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq) | 1414 | if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq) |
1415 | flag = SA_SHIRQ; | 1415 | flag = IRQF_SHARED; |
1416 | 1416 | ||
1417 | if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, | 1417 | if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, |
1418 | "mpsc-sdma", pi)) | 1418 | "mpsc-sdma", pi)) |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4d9435451f4a..459c0231aef3 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -934,7 +934,7 @@ static int pmz_startup(struct uart_port *port) | |||
934 | } | 934 | } |
935 | 935 | ||
936 | pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON; | 936 | pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON; |
937 | if (request_irq(uap->port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) { | 937 | if (request_irq(uap->port.irq, pmz_interrupt, IRQF_SHARED, "PowerMac Zilog", uap)) { |
938 | dev_err(&uap->dev->ofdev.dev, | 938 | dev_err(&uap->dev->ofdev.dev, |
939 | "Unable to register zs interrupt handler.\n"); | 939 | "Unable to register zs interrupt handler.\n"); |
940 | pmz_set_scc_power(uap, 0); | 940 | pmz_set_scc_power(uap, 0); |
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 28c1881a6691..b361669f85a1 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -495,7 +495,7 @@ static int serial_txx9_startup(struct uart_port *port) | |||
495 | sio_out(up, TXX9_SIDISR, 0); | 495 | sio_out(up, TXX9_SIDISR, 0); |
496 | 496 | ||
497 | retval = request_irq(up->port.irq, serial_txx9_interrupt, | 497 | retval = request_irq(up->port.irq, serial_txx9_interrupt, |
498 | SA_SHIRQ, "serial_txx9", up); | 498 | IRQF_SHARED, "serial_txx9", up); |
499 | if (retval) | 499 | if (retval) |
500 | return retval; | 500 | return retval; |
501 | 501 | ||
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 2509c3237e87..301573373c30 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -841,7 +841,7 @@ static int sci_request_irq(struct sci_port *port) | |||
841 | printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n"); | 841 | printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n"); |
842 | return -ENODEV; | 842 | return -ENODEV; |
843 | } | 843 | } |
844 | if (request_irq(port->irqs[0], sci_mpxed_interrupt, SA_INTERRUPT, | 844 | if (request_irq(port->irqs[0], sci_mpxed_interrupt, IRQF_DISABLED, |
845 | "sci", port)) { | 845 | "sci", port)) { |
846 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); | 846 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); |
847 | return -ENODEV; | 847 | return -ENODEV; |
@@ -850,7 +850,7 @@ static int sci_request_irq(struct sci_port *port) | |||
850 | for (i = 0; i < ARRAY_SIZE(handlers); i++) { | 850 | for (i = 0; i < ARRAY_SIZE(handlers); i++) { |
851 | if (!port->irqs[i]) | 851 | if (!port->irqs[i]) |
852 | continue; | 852 | continue; |
853 | if (request_irq(port->irqs[i], handlers[i], SA_INTERRUPT, | 853 | if (request_irq(port->irqs[i], handlers[i], IRQF_DISABLED, |
854 | desc[i], port)) { | 854 | desc[i], port)) { |
855 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); | 855 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); |
856 | return -ENODEV; | 856 | return -ENODEV; |
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 4b0afc8f12b9..2f148e5b9255 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
@@ -648,7 +648,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
648 | static int sn_sal_connect_interrupt(struct sn_cons_port *port) | 648 | static int sn_sal_connect_interrupt(struct sn_cons_port *port) |
649 | { | 649 | { |
650 | if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt, | 650 | if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt, |
651 | SA_INTERRUPT | SA_SHIRQ, | 651 | IRQF_DISABLED | IRQF_SHARED, |
652 | "SAL console driver", port) >= 0) { | 652 | "SAL console driver", port) >= 0) { |
653 | return SGI_UART_VECTOR; | 653 | return SGI_UART_VECTOR; |
654 | } | 654 | } |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 20a48697727c..0dbd4df44c05 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
@@ -1027,7 +1027,7 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up, | |||
1027 | int err; | 1027 | int err; |
1028 | 1028 | ||
1029 | err = request_irq(up->port.irq, sunsab_interrupt, | 1029 | err = request_irq(up->port.irq, sunsab_interrupt, |
1030 | SA_SHIRQ, "sab", up); | 1030 | IRQF_SHARED, "sab", up); |
1031 | if (err) { | 1031 | if (err) { |
1032 | of_iounmap(up->port.membase, | 1032 | of_iounmap(up->port.membase, |
1033 | sizeof(union sab82532_async_regs)); | 1033 | sizeof(union sab82532_async_regs)); |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index eabf477fee95..f9013baba05b 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -667,10 +667,10 @@ static int sunsu_startup(struct uart_port *port) | |||
667 | 667 | ||
668 | if (up->su_type != SU_PORT_PORT) { | 668 | if (up->su_type != SU_PORT_PORT) { |
669 | retval = request_irq(up->port.irq, sunsu_kbd_ms_interrupt, | 669 | retval = request_irq(up->port.irq, sunsu_kbd_ms_interrupt, |
670 | SA_SHIRQ, su_typev[up->su_type], up); | 670 | IRQF_SHARED, su_typev[up->su_type], up); |
671 | } else { | 671 | } else { |
672 | retval = request_irq(up->port.irq, sunsu_serial_interrupt, | 672 | retval = request_irq(up->port.irq, sunsu_serial_interrupt, |
673 | SA_SHIRQ, su_typev[up->su_type], up); | 673 | IRQF_SHARED, su_typev[up->su_type], up); |
674 | } | 674 | } |
675 | if (retval) { | 675 | if (retval) { |
676 | printk("su: Cannot register IRQ %d\n", up->port.irq); | 676 | printk("su: Cannot register IRQ %d\n", up->port.irq); |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 9ee7f3af9ae2..a1456d9352cb 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1354,7 +1354,7 @@ static int __devinit zs_probe(struct of_device *dev, const struct of_device_id * | |||
1354 | 1354 | ||
1355 | if (zilog_irq == -1) { | 1355 | if (zilog_irq == -1) { |
1356 | zilog_irq = op->irqs[0]; | 1356 | zilog_irq = op->irqs[0]; |
1357 | err = request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ, | 1357 | err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED, |
1358 | "zs", sunzilog_irq_chain); | 1358 | "zs", sunzilog_irq_chain); |
1359 | if (err) { | 1359 | if (err) { |
1360 | of_iounmap(rp, sizeof(struct zilog_layout)); | 1360 | of_iounmap(rp, sizeof(struct zilog_layout)); |
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c index a0da2aaf71c4..f802867c95c5 100644 --- a/drivers/serial/v850e_uart.c +++ b/drivers/serial/v850e_uart.c | |||
@@ -372,13 +372,13 @@ static int v850e_uart_startup (struct uart_port *port) | |||
372 | 372 | ||
373 | /* Alloc RX irq. */ | 373 | /* Alloc RX irq. */ |
374 | err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq, | 374 | err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq, |
375 | SA_INTERRUPT, "v850e_uart", port); | 375 | IRQF_DISABLED, "v850e_uart", port); |
376 | if (err) | 376 | if (err) |
377 | return err; | 377 | return err; |
378 | 378 | ||
379 | /* Alloc TX irq. */ | 379 | /* Alloc TX irq. */ |
380 | err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq, | 380 | err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq, |
381 | SA_INTERRUPT, "v850e_uart", port); | 381 | IRQF_DISABLED, "v850e_uart", port); |
382 | if (err) { | 382 | if (err) { |
383 | free_irq (V850E_UART_RX_IRQ (port->line), port); | 383 | free_irq (V850E_UART_RX_IRQ (port->line), port); |
384 | return err; | 384 | return err; |