aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-07 02:56:50 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-11 16:09:58 -0400
commitdf9f1b9f3308125fb7c9b484852b5d6a18b2bc02 (patch)
tree331df9a09deb74abbce3b135f1d4830db33e10e8 /drivers/net/ethernet
parent2414fe16ddf5572f3a712d6356a9fd8f8ce033ab (diff)
bcm63xx_enet: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from drivers/net/ethernet/broadcom/bcm63xx_enet.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/net/ethernet')
-rw-r--r--drivers/net/ethernet/broadcom/bcm63xx_enet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 8ac48fbf8a66..b9a5fb6400d3 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -926,13 +926,13 @@ static int bcm_enet_open(struct net_device *dev)
926 if (ret) 926 if (ret)
927 goto out_phy_disconnect; 927 goto out_phy_disconnect;
928 928
929 ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED, 929 ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0,
930 dev->name, dev); 930 dev->name, dev);
931 if (ret) 931 if (ret)
932 goto out_freeirq; 932 goto out_freeirq;
933 933
934 ret = request_irq(priv->irq_tx, bcm_enet_isr_dma, 934 ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
935 IRQF_DISABLED, dev->name, dev); 935 0, dev->name, dev);
936 if (ret) 936 if (ret)
937 goto out_freeirq_rx; 937 goto out_freeirq_rx;
938 938
@@ -2156,13 +2156,13 @@ static int bcm_enetsw_open(struct net_device *dev)
2156 enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan); 2156 enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
2157 2157
2158 ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 2158 ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
2159 IRQF_DISABLED, dev->name, dev); 2159 0, dev->name, dev);
2160 if (ret) 2160 if (ret)
2161 goto out_freeirq; 2161 goto out_freeirq;
2162 2162
2163 if (priv->irq_tx != -1) { 2163 if (priv->irq_tx != -1) {
2164 ret = request_irq(priv->irq_tx, bcm_enet_isr_dma, 2164 ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
2165 IRQF_DISABLED, dev->name, dev); 2165 0, dev->name, dev);
2166 if (ret) 2166 if (ret)
2167 goto out_freeirq_rx; 2167 goto out_freeirq_rx;
2168 } 2168 }