Commit 2c20ae68 authored by Michael Opdenacker's avatar Michael Opdenacker Committed by David S. Miller

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: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfdd56b2
...@@ -411,12 +411,12 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev) ...@@ -411,12 +411,12 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev)
#else #else
if (request_irq(port->irq, bfin_sir_rx_int, IRQF_DISABLED, "BFIN_SIR_RX", dev)) { if (request_irq(port->irq, bfin_sir_rx_int, 0, "BFIN_SIR_RX", dev)) {
dev_warn(&dev->dev, "Unable to attach SIR RX interrupt\n"); dev_warn(&dev->dev, "Unable to attach SIR RX interrupt\n");
return -EBUSY; return -EBUSY;
} }
if (request_irq(port->irq+1, bfin_sir_tx_int, IRQF_DISABLED, "BFIN_SIR_TX", dev)) { if (request_irq(port->irq+1, bfin_sir_tx_int, 0, "BFIN_SIR_TX", dev)) {
dev_warn(&dev->dev, "Unable to attach SIR TX interrupt\n"); dev_warn(&dev->dev, "Unable to attach SIR TX interrupt\n");
free_irq(port->irq, dev); free_irq(port->irq, dev);
return -EBUSY; return -EBUSY;
......
...@@ -1352,7 +1352,7 @@ toshoboe_net_open (struct net_device *dev) ...@@ -1352,7 +1352,7 @@ toshoboe_net_open (struct net_device *dev)
return 0; return 0;
rc = request_irq (self->io.irq, toshoboe_interrupt, rc = request_irq (self->io.irq, toshoboe_interrupt,
IRQF_SHARED | IRQF_DISABLED, dev->name, self); IRQF_SHARED, dev->name, self);
if (rc) if (rc)
return rc; return rc;
...@@ -1559,7 +1559,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid) ...@@ -1559,7 +1559,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
self->io.fir_base = self->base; self->io.fir_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT; self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq; self->io.irq = pci_dev->irq;
self->io.irqflags = IRQF_SHARED | IRQF_DISABLED; self->io.irqflags = IRQF_SHARED;
self->speed = self->io.speed = 9600; self->speed = self->io.speed = 9600;
self->async = 0; self->async = 0;
......
...@@ -804,7 +804,7 @@ static int sh_irda_probe(struct platform_device *pdev) ...@@ -804,7 +804,7 @@ static int sh_irda_probe(struct platform_device *pdev)
goto err_mem_4; goto err_mem_4;
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
err = request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self); err = request_irq(irq, sh_irda_irq, 0, "sh_irda", self);
if (err) { if (err) {
dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n"); dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
goto err_mem_4; goto err_mem_4;
......
...@@ -761,7 +761,7 @@ static int sh_sir_probe(struct platform_device *pdev) ...@@ -761,7 +761,7 @@ static int sh_sir_probe(struct platform_device *pdev)
goto err_mem_4; goto err_mem_4;
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
err = request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self); err = request_irq(irq, sh_sir_irq, 0, "sh_sir", self);
if (err) { if (err) {
dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n"); dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
goto err_mem_4; goto err_mem_4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment