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

Commit 0f2ed4c6 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: drivers/char: 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>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 69ab3912

drivers/char/amiserial.c

+1 −1
Original line number Diff line number Diff line
@@ -2051,7 +2051,7 @@ static int __init rs_init(void) 


	/* set ISRs, and then disable the rx interrupts */

	request_irq(IRQ_AMIGA_TBE, ser_tx_int, 0, "serial TX", state);

	request_irq(IRQ_AMIGA_RBF, ser_rx_int, SA_INTERRUPT, "serial RX", state);

	request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED, "serial RX", state);



	/* turn off Rx and Tx interrupts */

	custom.intena = IF_RBF | IF_TBE;

drivers/char/applicom.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int __init applicom_init(void) 
			continue;

		}



		if (request_irq(dev->irq, &ac_interrupt, SA_SHIRQ, "Applicom PCI", &dummy)) {

		if (request_irq(dev->irq, &ac_interrupt, IRQF_SHARED, "Applicom PCI", &dummy)) {

			printk(KERN_INFO "Could not allocate IRQ %d for PCI Applicom device.\n", dev->irq);

			iounmap(RamIO);

			pci_disable_device(dev);
@@ -276,7 +276,7 @@ static int __init applicom_init(void) 
		printk(KERN_NOTICE "Applicom ISA card found at mem 0x%lx, irq %d\n", mem + (LEN_RAM_IO*i), irq);



		if (!numisa) {

			if (request_irq(irq, &ac_interrupt, SA_SHIRQ, "Applicom ISA", &dummy)) {

			if (request_irq(irq, &ac_interrupt, IRQF_SHARED, "Applicom ISA", &dummy)) {

				printk(KERN_WARNING "Could not allocate IRQ %d for ISA Applicom device.\n", irq);

				iounmap(RamIO);

				apbs[boardno - 1].RamIO = NULL;

drivers/char/cyclades.c

+4 −4
Original line number Diff line number Diff line
@@ -4612,7 +4612,7 @@ cy_detect_isa(void) 


                /* allocate IRQ */

                if(request_irq(cy_isa_irq, cyy_interrupt,

				   SA_INTERRUPT, "Cyclom-Y", &cy_card[j]))

				   IRQF_DISABLED, "Cyclom-Y", &cy_card[j]))

                {

                        printk("Cyclom-Y/ISA found at 0x%lx ",

                                (unsigned long) cy_isa_address);
@@ -4785,7 +4785,7 @@ cy_detect_pci(void) 


                /* allocate IRQ */

                if(request_irq(cy_pci_irq, cyy_interrupt,

		        SA_SHIRQ, "Cyclom-Y", &cy_card[j]))

		        IRQF_SHARED, "Cyclom-Y", &cy_card[j]))

                {

                        printk("Cyclom-Y/PCI found at 0x%lx ",

			    (ulong) cy_pci_phys2);
@@ -4965,7 +4965,7 @@ cy_detect_pci(void) 
                /* allocate IRQ only if board has an IRQ */

		if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) {

		    if(request_irq(cy_pci_irq, cyz_interrupt,

			SA_SHIRQ, "Cyclades-Z", &cy_card[j]))

			IRQF_SHARED, "Cyclades-Z", &cy_card[j]))

		    {

                        printk("Cyclom-8Zo/PCI found at 0x%lx ",

			    (ulong) cy_pci_phys2);
@@ -5059,7 +5059,7 @@ cy_detect_pci(void) 
                /* allocate IRQ only if board has an IRQ */

		if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) {

		    if(request_irq(cy_pci_irq, cyz_interrupt,

			SA_SHIRQ, "Cyclades-Z", &cy_card[j]))

			IRQF_SHARED, "Cyclades-Z", &cy_card[j]))

		    {

                        printk("Cyclom-Ze/PCI found at 0x%lx ",

			    (ulong) cy_pci_phys2);

drivers/char/esp.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static int startup(struct esp_struct * info) 
	 * Allocate the IRQ

	 */



	retval = request_irq(info->irq, rs_interrupt_single, SA_SHIRQ,

	retval = request_irq(info->irq, rs_interrupt_single, IRQF_SHARED,

			     "esp serial", info);



	if (retval) {

drivers/char/ftape/lowlevel/fdc-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static int fdc_grab_irq_and_dma(void) 
		/*  Get fast interrupt handler.

		 */

		if (request_irq(fdc.irq, ftape_interrupt,

				SA_INTERRUPT, "ft", ftape_id)) {

				IRQF_DISABLED, "ft", ftape_id)) {

			TRACE_ABORT(-EIO, ft_t_bug,

				    "Unable to grab IRQ%d for ftape driver",

				    fdc.irq);