Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2c20ae6862ba137bf79b918de6b739a60260e37c

Authored by Michael Opdenacker
Committed by David S. Miller
1 parent bfdd56b275
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

irda: remove deprecated IRQF_DISABLED 

This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/net/irda/bfin_sir.c
Diff comments   View file @ 2c20ae6
... ... @@ -411,12 +411,12 @@
411 411  
412 412 #else
413 413  
414   - if (request_irq(port->irq, bfin_sir_rx_int, IRQF_DISABLED, "BFIN_SIR_RX", dev)) {
  414 + if (request_irq(port->irq, bfin_sir_rx_int, 0, "BFIN_SIR_RX", dev)) {
415 415 dev_warn(&dev->dev, "Unable to attach SIR RX interrupt\n");
416 416 return -EBUSY;
417 417 }
418 418  
419   - if (request_irq(port->irq+1, bfin_sir_tx_int, IRQF_DISABLED, "BFIN_SIR_TX", dev)) {
  419 + if (request_irq(port->irq+1, bfin_sir_tx_int, 0, "BFIN_SIR_TX", dev)) {
420 420 dev_warn(&dev->dev, "Unable to attach SIR TX interrupt\n");
421 421 free_irq(port->irq, dev);
422 422 return -EBUSY;
drivers/net/irda/donauboe.c
Diff comments   View file @ 2c20ae6
... ... @@ -1352,7 +1352,7 @@
1352 1352 return 0;
1353 1353  
1354 1354 rc = request_irq (self->io.irq, toshoboe_interrupt,
1355   - IRQF_SHARED | IRQF_DISABLED, dev->name, self);
  1355 + IRQF_SHARED, dev->name, self);
1356 1356 if (rc)
1357 1357 return rc;
1358 1358  
... ... @@ -1559,7 +1559,7 @@
1559 1559 self->io.fir_base = self->base;
1560 1560 self->io.fir_ext = OBOE_IO_EXTENT;
1561 1561 self->io.irq = pci_dev->irq;
1562   - self->io.irqflags = IRQF_SHARED | IRQF_DISABLED;
  1562 + self->io.irqflags = IRQF_SHARED;
1563 1563  
1564 1564 self->speed = self->io.speed = 9600;
1565 1565 self->async = 0;
drivers/net/irda/sh_irda.c
Diff comments   View file @ 2c20ae6
... ... @@ -804,7 +804,7 @@
804 804 goto err_mem_4;
805 805  
806 806 platform_set_drvdata(pdev, ndev);
807   - err = request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self);
  807 + err = request_irq(irq, sh_irda_irq, 0, "sh_irda", self);
808 808 if (err) {
809 809 dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
810 810 goto err_mem_4;
drivers/net/irda/sh_sir.c
Diff comments   View file @ 2c20ae6
... ... @@ -761,7 +761,7 @@
761 761 goto err_mem_4;
762 762  
763 763 platform_set_drvdata(pdev, ndev);
764   - err = request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self);
  764 + err = request_irq(irq, sh_sir_irq, 0, "sh_sir", self);
765 765 if (err) {
766 766 dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
767 767 goto err_mem_4;