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

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

[PATCH] irq-flags: drivers/net: 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: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dace1453

drivers/net/3c515.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int corkscrew_open(struct net_device *dev) 
				   vp->product_name, dev)) return -EAGAIN;

		enable_dma(dev->dma);

		set_dma_mode(dev->dma, DMA_MODE_CASCADE);

	} else if (request_irq(dev->irq, &corkscrew_interrupt, SA_SHIRQ,

	} else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED,

			       vp->product_name, dev)) {

		return -EAGAIN;

	}

drivers/net/3c523.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int elmc_open(struct net_device *dev) 


	elmc_id_attn586();	/* disable interrupts */



	ret = request_irq(dev->irq, &elmc_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM,

	ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  dev->name, dev);

	if (ret) {

		printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);

drivers/net/3c527.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot) 
	 *	Grab the IRQ

	 */



	err = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, DRV_NAME, dev);

	err = request_irq(dev->irq, &mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);

	if (err) {

		release_region(dev->base_addr, MC32_IO_EXTENT);

		printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);

drivers/net/3c59x.c

+2 −2
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int vortex_resume(struct pci_dev *pdev) 
		pci_enable_device(pdev);

		pci_set_master(pdev);

		if (request_irq(dev->irq, vp->full_bus_master_rx ?

				&boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) {

				&boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) {

			printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);

			pci_disable_device(pdev);

			return -EBUSY;
@@ -1833,7 +1833,7 @@ vortex_open(struct net_device *dev) 


	/* Use the now-standard shared IRQ implementation. */

	if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?

				&boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev))) {

				&boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) {

		printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);

		goto out;

	}

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static int cp_open (struct net_device *dev) 


	cp_init_hw(cp);



	rc = request_irq(dev->irq, cp_interrupt, SA_SHIRQ, dev->name, dev);

	rc = request_irq(dev->irq, cp_interrupt, IRQF_SHARED, dev->name, dev);

	if (rc)

		goto err_out_hw;