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

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

[PATCH] irq-flags: misc drivers: 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 8076fe32

drivers/acorn/block/mfmhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static int mfm_do_init(unsigned char irqmask) 


	printk("mfm: detected %d hard drive%s\n", mfm_drives,

				mfm_drives == 1 ? "" : "s");

	ret = request_irq(mfm_irq, mfm_interrupt_handler, SA_INTERRUPT, "MFM harddisk", NULL);

	ret = request_irq(mfm_irq, mfm_interrupt_handler, IRQF_DISABLED, "MFM harddisk", NULL);

	if (ret) {

		printk("mfm: unable to get IRQ%d\n", mfm_irq);

		goto out4;

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, 


	acpi_irq_handler = handler;

	acpi_irq_context = context;

	if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {

	if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {

		printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);

		return AE_NOT_ACQUIRED;

	}

drivers/atm/ambassador.c

+1 −1
Original line number Diff line number Diff line
@@ -2286,7 +2286,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ 
	setup_pci_dev(pci_dev);



	// grab (but share) IRQ and install handler

	err = request_irq(irq, interrupt_handler, SA_SHIRQ, DEV_LABEL, dev);

	err = request_irq(irq, interrupt_handler, IRQF_SHARED, DEV_LABEL, dev);

	if (err < 0) {

		PRINTK (KERN_ERR, "request IRQ failed!");

		goto out_reset;

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,7 @@ static int __devinit eni_start(struct atm_dev *dev) 


	DPRINTK(">eni_start\n");

	eni_dev = ENI_DEV(dev);

	if (request_irq(eni_dev->irq,&eni_int,SA_SHIRQ,DEV_LABEL,dev)) {

	if (request_irq(eni_dev->irq,&eni_int,IRQF_SHARED,DEV_LABEL,dev)) {

		printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",

		    dev->number,eni_dev->irq);

		error = -EAGAIN;

drivers/atm/firestream.c

+1 −1
Original line number Diff line number Diff line
@@ -1829,7 +1829,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
		init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);



	dev->irq = pci_dev->irq;

	if (request_irq (dev->irq, fs_irq, SA_SHIRQ, "firestream", dev)) {

	if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {

		printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);

		/* XXX undo all previous stuff... */

		return 1;