Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40663cc7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1d6f359a

drivers/serial/8250.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/serial/at91_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/serial/crisv10.c

+11 −11
Original line number Diff line number Diff line
@@ -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");

	}

drivers/serial/dz.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/serial/icom.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	 }