提交 40663cc7 编写于 作者: T Thomas Gleixner 提交者: Linus Torvalds

[PATCH] irq-flags: serial: Use the new IRQF_ constants

Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 1d6f359a
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
/* /*
* Configuration: * Configuration:
* share_irqs - whether we pass SA_SHIRQ to request_irq(). This option * share_irqs - whether we pass IRQF_SHARED to request_irq(). This option
* is unsafe when used on edge-triggered interrupts. * is unsafe when used on edge-triggered interrupts.
*/ */
static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; 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,7 +1400,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
static int serial_link_irq_chain(struct uart_8250_port *up) static int serial_link_irq_chain(struct uart_8250_port *up)
{ {
struct irq_info *i = irq_lists + up->port.irq; struct irq_info *i = irq_lists + up->port.irq;
int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0;
spin_lock_irq(&i->lock); spin_lock_irq(&i->lock);
......
...@@ -387,7 +387,7 @@ static int at91_startup(struct uart_port *port) ...@@ -387,7 +387,7 @@ static int at91_startup(struct uart_port *port)
/* /*
* Allocate the IRQ * Allocate the IRQ
*/ */
retval = request_irq(port->irq, at91_interrupt, SA_SHIRQ, "at91_serial", port); retval = request_irq(port->irq, at91_interrupt, IRQF_SHARED, "at91_serial", port);
if (retval) { if (retval) {
printk("at91_serial: at91_startup - Can't get irq\n"); printk("at91_serial: at91_startup - Can't get irq\n");
return retval; return retval;
......
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
* Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when
* closing the last filehandle, NASTY!. * closing the last filehandle, NASTY!.
* Added break generation, not tested though! * Added break generation, not tested though!
* Use SA_SHIRQ when request_irq() for ser2 and ser3 (shared with) par0 and par1. * Use IRQF_SHARED when request_irq() for ser2 and ser3 (shared with) par0 and par1.
* You can't use them at the same time (yet..), but you can hopefully switch * You can't use them at the same time (yet..), but you can hopefully switch
* between ser2/par0, ser3/par1 with the same kernel config. * between ser2/par0, ser3/par1 with the same kernel config.
* Replaced some magic constants with defines * Replaced some magic constants with defines
...@@ -4942,55 +4942,55 @@ rs_init(void) ...@@ -4942,55 +4942,55 @@ rs_init(void)
/* Not needed in simulator. May only complicate stuff. */ /* Not needed in simulator. May only complicate stuff. */
/* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */
if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial ", NULL)) if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial ", NULL))
panic("irq8"); panic("irq8");
#ifdef CONFIG_ETRAX_SERIAL_PORT0 #ifdef CONFIG_ETRAX_SERIAL_PORT0
#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT
if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 0 dma tr", NULL)) if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 0 dma tr", NULL))
panic("irq22"); panic("irq22");
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN
if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 0 dma rec", NULL)) if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 0 dma rec", NULL))
panic("irq23"); panic("irq23");
#endif #endif
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT1 #ifdef CONFIG_ETRAX_SERIAL_PORT1
#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT
if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 1 dma tr", NULL)) if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 1 dma tr", NULL))
panic("irq24"); panic("irq24");
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN
if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 1 dma rec", NULL)) if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 1 dma rec", NULL))
panic("irq25"); panic("irq25");
#endif #endif
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT2 #ifdef CONFIG_ETRAX_SERIAL_PORT2
/* DMA Shared with par0 (and SCSI0 and ATA) */ /* DMA Shared with par0 (and SCSI0 and ATA) */
#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT
if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma tr", NULL)) if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma tr", NULL))
panic("irq18"); panic("irq18");
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN
if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma rec", NULL)) if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma rec", NULL))
panic("irq19"); panic("irq19");
#endif #endif
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT3 #ifdef CONFIG_ETRAX_SERIAL_PORT3
/* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */ /* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */
#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT
if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma tr", NULL)) if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma tr", NULL))
panic("irq20"); panic("irq20");
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN
if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma rec", NULL)) if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma rec", NULL))
panic("irq21"); panic("irq21");
#endif #endif
#endif #endif
#ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST #ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST
if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, SA_SHIRQ | SA_INTERRUPT, if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, IRQF_SHARED | IRQF_DISABLED,
"fast serial dma timeout", NULL)) { "fast serial dma timeout", NULL)) {
printk(KERN_CRIT "err: timer1 irq\n"); printk(KERN_CRIT "err: timer1 irq\n");
} }
......
...@@ -797,7 +797,7 @@ int __init dz_init(void) ...@@ -797,7 +797,7 @@ int __init dz_init(void)
restore_flags(flags); restore_flags(flags);
if (request_irq(dz_ports[0].port.irq, dz_interrupt, if (request_irq(dz_ports[0].port.irq, dz_interrupt,
SA_INTERRUPT, "DZ", &dz_ports[0])) IRQF_DISABLED, "DZ", &dz_ports[0]))
panic("Unable to register DZ interrupt"); panic("Unable to register DZ interrupt");
ret = uart_register_driver(&dz_reg); ret = uart_register_driver(&dz_reg);
......
...@@ -1563,7 +1563,7 @@ static int __devinit icom_probe(struct pci_dev *dev, ...@@ -1563,7 +1563,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
/* save off irq and request irq line */ /* save off irq and request irq line */
if ( (retval = request_irq(dev->irq, icom_interrupt, if ( (retval = request_irq(dev->irq, icom_interrupt,
SA_INTERRUPT | SA_SHIRQ, ICOM_DRIVER_NAME, IRQF_DISABLED | IRQF_SHARED, ICOM_DRIVER_NAME,
(void *) icom_adapter))) { (void *) icom_adapter))) {
goto probe_exit2; goto probe_exit2;
} }
......
...@@ -404,7 +404,7 @@ static int imx_startup(struct uart_port *port) ...@@ -404,7 +404,7 @@ static int imx_startup(struct uart_port *port)
if (retval) goto error_out2; if (retval) goto error_out2;
retval = request_irq(sport->rtsirq, imx_rtsint, retval = request_irq(sport->rtsirq, imx_rtsint,
SA_TRIGGER_FALLING | SA_TRIGGER_RISING, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
DRIVER_NAME, sport); DRIVER_NAME, sport);
if (retval) goto error_out3; if (retval) goto error_out3;
......
...@@ -2855,7 +2855,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd) ...@@ -2855,7 +2855,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
control->ic_soft = soft; control->ic_soft = soft;
/* Hook up interrupt handler */ /* Hook up interrupt handler */
if (!request_irq(idd->idd_pdev->irq, ioc4_intr, SA_SHIRQ, if (!request_irq(idd->idd_pdev->irq, ioc4_intr, IRQF_SHARED,
"sgi-ioc4serial", soft)) { "sgi-ioc4serial", soft)) {
control->ic_irq = idd->idd_pdev->irq; control->ic_irq = idd->idd_pdev->irq;
} else { } else {
......
...@@ -121,7 +121,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -121,7 +121,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
rc = request_irq(brd->irq, brd->bd_ops->intr, rc = request_irq(brd->irq, brd->bd_ops->intr,
SA_INTERRUPT|SA_SHIRQ, "JSM", brd); IRQF_DISABLED|IRQF_SHARED, "JSM", brd);
if (rc) { if (rc) {
printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq); printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
goto out_iounmap; goto out_iounmap;
......
...@@ -542,7 +542,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up) ...@@ -542,7 +542,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up)
static int serial_link_irq_chain(struct uart_sio_port *up) static int serial_link_irq_chain(struct uart_sio_port *up)
{ {
struct irq_info *i = irq_lists + up->port.irq; struct irq_info *i = irq_lists + up->port.irq;
int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0;
spin_lock_irq(&i->lock); spin_lock_irq(&i->lock);
......
...@@ -1596,7 +1596,7 @@ static void mcfrs_irqinit(struct mcf_serial *info) ...@@ -1596,7 +1596,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)
/* Clear mask, so no surprise interrupts. */ /* Clear mask, so no surprise interrupts. */
uartp[MCFUART_UIMR] = 0; uartp[MCFUART_UIMR] = 0;
if (request_irq(info->irq, mcfrs_interrupt, SA_INTERRUPT, if (request_irq(info->irq, mcfrs_interrupt, IRQF_DISABLED,
"ColdFire UART", NULL)) { "ColdFire UART", NULL)) {
printk("MCFRS: Unable to attach ColdFire UART %d interrupt " printk("MCFRS: Unable to attach ColdFire UART %d interrupt "
"vector=%d\n", info->line, info->irq); "vector=%d\n", info->line, info->irq);
......
...@@ -190,7 +190,7 @@ mpc52xx_uart_startup(struct uart_port *port) ...@@ -190,7 +190,7 @@ mpc52xx_uart_startup(struct uart_port *port)
/* Request IRQ */ /* Request IRQ */
ret = request_irq(port->irq, mpc52xx_uart_int, ret = request_irq(port->irq, mpc52xx_uart_int,
SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port); IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
if (ret) if (ret)
return ret; return ret;
......
...@@ -1412,7 +1412,7 @@ mpsc_startup(struct uart_port *port) ...@@ -1412,7 +1412,7 @@ mpsc_startup(struct uart_port *port)
/* If irq's are shared, need to set flag */ /* If irq's are shared, need to set flag */
if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq) if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq)
flag = SA_SHIRQ; flag = IRQF_SHARED;
if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, if (request_irq(pi->port.irq, mpsc_sdma_intr, flag,
"mpsc-sdma", pi)) "mpsc-sdma", pi))
......
...@@ -934,7 +934,7 @@ static int pmz_startup(struct uart_port *port) ...@@ -934,7 +934,7 @@ static int pmz_startup(struct uart_port *port)
} }
pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON; pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
if (request_irq(uap->port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) { if (request_irq(uap->port.irq, pmz_interrupt, IRQF_SHARED, "PowerMac Zilog", uap)) {
dev_err(&uap->dev->ofdev.dev, dev_err(&uap->dev->ofdev.dev,
"Unable to register zs interrupt handler.\n"); "Unable to register zs interrupt handler.\n");
pmz_set_scc_power(uap, 0); pmz_set_scc_power(uap, 0);
......
...@@ -495,7 +495,7 @@ static int serial_txx9_startup(struct uart_port *port) ...@@ -495,7 +495,7 @@ static int serial_txx9_startup(struct uart_port *port)
sio_out(up, TXX9_SIDISR, 0); sio_out(up, TXX9_SIDISR, 0);
retval = request_irq(up->port.irq, serial_txx9_interrupt, retval = request_irq(up->port.irq, serial_txx9_interrupt,
SA_SHIRQ, "serial_txx9", up); IRQF_SHARED, "serial_txx9", up);
if (retval) if (retval)
return retval; return retval;
......
...@@ -841,7 +841,7 @@ static int sci_request_irq(struct sci_port *port) ...@@ -841,7 +841,7 @@ static int sci_request_irq(struct sci_port *port)
printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n"); printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n");
return -ENODEV; return -ENODEV;
} }
if (request_irq(port->irqs[0], sci_mpxed_interrupt, SA_INTERRUPT, if (request_irq(port->irqs[0], sci_mpxed_interrupt, IRQF_DISABLED,
"sci", port)) { "sci", port)) {
printk(KERN_ERR "sci: Cannot allocate irq.\n"); printk(KERN_ERR "sci: Cannot allocate irq.\n");
return -ENODEV; return -ENODEV;
...@@ -850,7 +850,7 @@ static int sci_request_irq(struct sci_port *port) ...@@ -850,7 +850,7 @@ static int sci_request_irq(struct sci_port *port)
for (i = 0; i < ARRAY_SIZE(handlers); i++) { for (i = 0; i < ARRAY_SIZE(handlers); i++) {
if (!port->irqs[i]) if (!port->irqs[i])
continue; continue;
if (request_irq(port->irqs[i], handlers[i], SA_INTERRUPT, if (request_irq(port->irqs[i], handlers[i], IRQF_DISABLED,
desc[i], port)) { desc[i], port)) {
printk(KERN_ERR "sci: Cannot allocate irq.\n"); printk(KERN_ERR "sci: Cannot allocate irq.\n");
return -ENODEV; return -ENODEV;
......
...@@ -648,7 +648,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -648,7 +648,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static int sn_sal_connect_interrupt(struct sn_cons_port *port) static int sn_sal_connect_interrupt(struct sn_cons_port *port)
{ {
if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt, if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
SA_INTERRUPT | SA_SHIRQ, IRQF_DISABLED | IRQF_SHARED,
"SAL console driver", port) >= 0) { "SAL console driver", port) >= 0) {
return SGI_UART_VECTOR; return SGI_UART_VECTOR;
} }
......
...@@ -1027,7 +1027,7 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up, ...@@ -1027,7 +1027,7 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up,
int err; int err;
err = request_irq(up->port.irq, sunsab_interrupt, err = request_irq(up->port.irq, sunsab_interrupt,
SA_SHIRQ, "sab", up); IRQF_SHARED, "sab", up);
if (err) { if (err) {
of_iounmap(up->port.membase, of_iounmap(up->port.membase,
sizeof(union sab82532_async_regs)); sizeof(union sab82532_async_regs));
......
...@@ -667,10 +667,10 @@ static int sunsu_startup(struct uart_port *port) ...@@ -667,10 +667,10 @@ static int sunsu_startup(struct uart_port *port)
if (up->su_type != SU_PORT_PORT) { if (up->su_type != SU_PORT_PORT) {
retval = request_irq(up->port.irq, sunsu_kbd_ms_interrupt, retval = request_irq(up->port.irq, sunsu_kbd_ms_interrupt,
SA_SHIRQ, su_typev[up->su_type], up); IRQF_SHARED, su_typev[up->su_type], up);
} else { } else {
retval = request_irq(up->port.irq, sunsu_serial_interrupt, retval = request_irq(up->port.irq, sunsu_serial_interrupt,
SA_SHIRQ, su_typev[up->su_type], up); IRQF_SHARED, su_typev[up->su_type], up);
} }
if (retval) { if (retval) {
printk("su: Cannot register IRQ %d\n", up->port.irq); printk("su: Cannot register IRQ %d\n", up->port.irq);
......
...@@ -1354,7 +1354,7 @@ static int __devinit zs_probe(struct of_device *dev, const struct of_device_id * ...@@ -1354,7 +1354,7 @@ static int __devinit zs_probe(struct of_device *dev, const struct of_device_id *
if (zilog_irq == -1) { if (zilog_irq == -1) {
zilog_irq = op->irqs[0]; zilog_irq = op->irqs[0];
err = request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ, err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
"zs", sunzilog_irq_chain); "zs", sunzilog_irq_chain);
if (err) { if (err) {
of_iounmap(rp, sizeof(struct zilog_layout)); of_iounmap(rp, sizeof(struct zilog_layout));
......
...@@ -372,13 +372,13 @@ static int v850e_uart_startup (struct uart_port *port) ...@@ -372,13 +372,13 @@ static int v850e_uart_startup (struct uart_port *port)
/* Alloc RX irq. */ /* Alloc RX irq. */
err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq, err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq,
SA_INTERRUPT, "v850e_uart", port); IRQF_DISABLED, "v850e_uart", port);
if (err) if (err)
return err; return err;
/* Alloc TX irq. */ /* Alloc TX irq. */
err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq, err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq,
SA_INTERRUPT, "v850e_uart", port); IRQF_DISABLED, "v850e_uart", port);
if (err) { if (err) {
free_irq (V850E_UART_RX_IRQ (port->line), port); free_irq (V850E_UART_RX_IRQ (port->line), port);
return err; return err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册