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

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

[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2 



The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal.  Fixup the remaining users in -mm.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38515e90

drivers/input/keyboard/gpio_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 
		int irq = IRQ_GPIO(pdata->buttons[i].gpio);



		set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);

		error = request_irq(irq, gpio_keys_isr, SA_SAMPLE_RANDOM,

		error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,

				     pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys",

				     pdev);

		if (error) {

drivers/mtd/nand/cafe.c

+2 −1
Original line number Diff line number Diff line
@@ -597,7 +597,8 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev, 
		cafe_writel(cafe, 0xffffffff, NAND_TIMING3);

	}

	cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);

	err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd);

	err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED,

			  "CAFE NAND", mtd);

	if (err) {

		dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);

drivers/net/cxgb3/cxgb3_main.c

+2 −1
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ static int cxgb_up(struct adapter *adap) 
				      t3_intr_handler(adap,

						      adap->sge.qs[0].rspq.

						      polling),

				      (adap->flags & USING_MSI) ? 0 : SA_SHIRQ,

				      (adap->flags & USING_MSI) ?

				       0 : IRQF_SHARED,

				      adap->name, adap)))

		goto irq_err;

drivers/net/sc92031.c

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static int sc92031_open(struct net_device *dev) 
	priv->tx_head = priv->tx_tail = 0;



	err = request_irq(pdev->irq, sc92031_interrupt,

			SA_SHIRQ, dev->name, dev);

			IRQF_SHARED, dev->name, dev);

	if (unlikely(err < 0))

		goto out_request_irq;