Skip to content

Commit

Permalink
bcm63xx_enet: remove deprecated IRQF_DISABLED
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Opdenacker authored and David S. Miller committed Sep 11, 2013
1 parent 2414fe1 commit df9f1b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/broadcom/bcm63xx_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,13 +926,13 @@ static int bcm_enet_open(struct net_device *dev)
if (ret)
goto out_phy_disconnect;

ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0,
dev->name, dev);
if (ret)
goto out_freeirq;

ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
IRQF_DISABLED, dev->name, dev);
0, dev->name, dev);
if (ret)
goto out_freeirq_rx;

Expand Down Expand Up @@ -2156,13 +2156,13 @@ static int bcm_enetsw_open(struct net_device *dev)
enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);

ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
IRQF_DISABLED, dev->name, dev);
0, dev->name, dev);
if (ret)
goto out_freeirq;

if (priv->irq_tx != -1) {
ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
IRQF_DISABLED, dev->name, dev);
0, dev->name, dev);
if (ret)
goto out_freeirq_rx;
}
Expand Down

0 comments on commit df9f1b9

Please sign in to comment.