Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9f1b9f authored by Michael Opdenacker's avatar Michael Opdenacker Committed by David S. Miller
Browse files

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: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Reviewed-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2414fe16

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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;

	}