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

Signed-off-by: Thomas 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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

20 files changed, 34 insertions, 34 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 9c5d36f5014..0995430e4cf 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -48,7 +48,7 @@
 
 /*
  * 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.
  */
 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)
 static int serial_link_irq_chain(struct uart_8250_port *up)
 {
         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);
 
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index 7b3b3f3d510..a7d664383da 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)
         /*
          * 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) {
                 printk("at91_serial: at91_startup - Can't get irq\n");
                 return retval;
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 901be348345..cabd048c863 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -415,7 +415,7 @@
  * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when
  * closing the last filehandle, NASTY!.
  * 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
  * between ser2/par0, ser3/par1 with the same kernel config.
  * Replaced some magic constants with defines
@@ -4942,55 +4942,55 @@ rs_init(void)
         /* 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... */
 
-        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");
 
 #ifdef CONFIG_ETRAX_SERIAL_PORT0
 #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");
 #endif
 #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");
 #endif
 #endif
 
 #ifdef CONFIG_ETRAX_SERIAL_PORT1
 #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");
 #endif
 #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");
 #endif
 #endif
 #ifdef CONFIG_ETRAX_SERIAL_PORT2
         /* DMA Shared with par0 (and SCSI0 and ATA) */
 #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");
 #endif
 #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");
 #endif
 #endif
 #ifdef CONFIG_ETRAX_SERIAL_PORT3
         /* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */
 #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");
 #endif
 #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");
 #endif
 #endif
 
 #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)) {
                 printk(KERN_CRIT "err: timer1 irq\n");
         }
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index ecf824bd2d4..d119c8296a7 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -797,7 +797,7 @@ int __init dz_init(void)
         restore_flags(flags);
 
         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");
 
         ret = uart_register_driver(&dz_reg);
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index ad1e753cbc5..a3c00a25214 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -1563,7 +1563,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
 
          /* save off irq and request irq line */
          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))) {
                   goto probe_exit2;
          }
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 0b5f39d038b..4a142d6b8f3 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -404,7 +404,7 @@ static int imx_startup(struct uart_port *port)
         if (retval) goto error_out2;
 
         retval = request_irq(sport->rtsirq, imx_rtsint,
-                             SA_TRIGGER_FALLING | SA_TRIGGER_RISING,
+                             IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
                              DRIVER_NAME, sport);
         if (retval) goto error_out3;
 
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 717e47bbd78..576ca1eaa2b 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)
         control->ic_soft = soft;
 
         /* 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)) {
                 control->ic_irq = idd->idd_pdev->irq;
         } else {
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index b3e1f71be4d..244f63be3a0 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)
         }
 
         rc = request_irq(brd->irq, brd->bd_ops->intr,
-                        SA_INTERRUPT|SA_SHIRQ, "JSM", brd);
+                        IRQF_DISABLED|IRQF_SHARED, "JSM", brd);
         if (rc) {
                 printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
                 goto out_iounmap;
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index fbaae96f4c9..e7fe4bb46ec 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)
 static int serial_link_irq_chain(struct uart_sio_port *up)
 {
         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);
 
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 29c0630e3e6..832abd3c470 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -1596,7 +1596,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)
         /* Clear mask, so no surprise interrupts. */
         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)) {
                 printk("MCFRS: Unable to attach ColdFire UART %d interrupt "
                         "vector=%d\n", info->line, info->irq);
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 1b8e554f674..48eb22d3a63 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -190,7 +190,7 @@ mpc52xx_uart_startup(struct uart_port *port)
 
         /* Request IRQ */
         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)
                 return ret;
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 8c498f785e2..63d2a66e563 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1412,7 +1412,7 @@ mpsc_startup(struct uart_port *port)
 
                 /* If irq's are shared, need to set flag */
                 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,
                                 "mpsc-sdma", pi))
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 4d9435451f4..459c0231aef 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)
         }       
 
         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,
                         "Unable to register zs interrupt handler.\n");
                 pmz_set_scc_power(uap, 0);
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 28c1881a669..b361669f85a 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)
         sio_out(up, TXX9_SIDISR, 0);
 
         retval = request_irq(up->port.irq, serial_txx9_interrupt,
-                             SA_SHIRQ, "serial_txx9", up);
+                             IRQF_SHARED, "serial_txx9", up);
         if (retval)
                 return retval;
 
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 2509c3237e8..301573373c3 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)
                         printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n");
                         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)) {
                         printk(KERN_ERR "sci: Cannot allocate irq.\n");
                         return -ENODEV;
@@ -850,7 +850,7 @@ static int sci_request_irq(struct sci_port *port)
                 for (i = 0; i < ARRAY_SIZE(handlers); i++) {
                         if (!port->irqs[i])
                                 continue;
-                        if (request_irq(port->irqs[i], handlers[i], SA_INTERRUPT,
+                        if (request_irq(port->irqs[i], handlers[i], IRQF_DISABLED,
                                         desc[i], port)) {
                                 printk(KERN_ERR "sci: Cannot allocate irq.\n");
                                 return -ENODEV;
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 4b0afc8f12b..2f148e5b925 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)
 static int sn_sal_connect_interrupt(struct sn_cons_port *port)
 {
         if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-                        SA_INTERRUPT | SA_SHIRQ,
+                        IRQF_DISABLED | IRQF_SHARED,
                         "SAL console driver", port) >= 0) {
                 return SGI_UART_VECTOR;
         }
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 20a48697727..0dbd4df44c0 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,
                 int err;
 
                 err = request_irq(up->port.irq, sunsab_interrupt,
-                                  SA_SHIRQ, "sab", up);
+                                  IRQF_SHARED, "sab", up);
                 if (err) {
                         of_iounmap(up->port.membase,
                                    sizeof(union sab82532_async_regs));
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index eabf477fee9..f9013baba05 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -667,10 +667,10 @@ static int sunsu_startup(struct uart_port *port)
 
         if (up->su_type != SU_PORT_PORT) {
                 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 {
                 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) {
                 printk("su: Cannot register IRQ %d\n", up->port.irq);
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 9ee7f3af9ae..a1456d9352c 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 *
 
         if (zilog_irq == -1) {
                 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);
                 if (err) {
                         of_iounmap(rp, sizeof(struct zilog_layout));
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
index a0da2aaf71c..f802867c95c 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)
 
         /* Alloc 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)
                 return err;
 
         /* Alloc 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) {
                 free_irq (V850E_UART_RX_IRQ (port->line), port);
                 return err;