diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-11 23:35:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-12 23:27:09 -0400 |
commit | 63aca0f7fa4c9e098fb5b6a24798b5f060e9de08 (patch) | |
tree | 7e367b6cbb276189c7a51a805a2e4938d8341766 /drivers | |
parent | 6e43fc04a6bc357d260583b8440882f28069207f (diff) |
bfin_mac: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from
drivers/net/ethernet/adi/bfin_mac.c.
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>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c index e66684a438f5..75fb1d20d6fd 100644 --- a/drivers/net/ethernet/adi/bfin_mac.c +++ b/drivers/net/ethernet/adi/bfin_mac.c | |||
@@ -530,7 +530,7 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev, | |||
530 | if (lp->wol && !lp->irq_wake_requested) { | 530 | if (lp->wol && !lp->irq_wake_requested) { |
531 | /* register wake irq handler */ | 531 | /* register wake irq handler */ |
532 | rc = request_irq(IRQ_MAC_WAKEDET, bfin_mac_wake_interrupt, | 532 | rc = request_irq(IRQ_MAC_WAKEDET, bfin_mac_wake_interrupt, |
533 | IRQF_DISABLED, "EMAC_WAKE", dev); | 533 | 0, "EMAC_WAKE", dev); |
534 | if (rc) | 534 | if (rc) |
535 | return rc; | 535 | return rc; |
536 | lp->irq_wake_requested = true; | 536 | lp->irq_wake_requested = true; |
@@ -1686,7 +1686,7 @@ static int bfin_mac_probe(struct platform_device *pdev) | |||
1686 | /* now, enable interrupts */ | 1686 | /* now, enable interrupts */ |
1687 | /* register irq handler */ | 1687 | /* register irq handler */ |
1688 | rc = request_irq(IRQ_MAC_RX, bfin_mac_interrupt, | 1688 | rc = request_irq(IRQ_MAC_RX, bfin_mac_interrupt, |
1689 | IRQF_DISABLED, "EMAC_RX", ndev); | 1689 | 0, "EMAC_RX", ndev); |
1690 | if (rc) { | 1690 | if (rc) { |
1691 | dev_err(&pdev->dev, "Cannot request Blackfin MAC RX IRQ!\n"); | 1691 | dev_err(&pdev->dev, "Cannot request Blackfin MAC RX IRQ!\n"); |
1692 | rc = -EBUSY; | 1692 | rc = -EBUSY; |