LinuxLists.cc - [PATCH] net: fec: remove deprecated IRQF

2013-09-13 03:44:47

Subject: [PATCH] net: fec: remove deprecated IRQF_DISABLED

This patch proposes to remove the IRQF_DISABLED flag from
drivers/net/ethernet/freescale/fec_main.c

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/net/ethernet/freescale/fec_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index f9aacf5..b2793b9 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2199,7 +2199,7 @@ fec_probe(struct platform_device *pdev)
goto failed_irq;
}
ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt,
- IRQF_DISABLED, pdev->name, ndev);
+ 0, pdev->name, ndev);
if (ret)
goto failed_irq;
}
--
1.8.1.2

2013-09-13 04:45:58

by Fugang Duan

[permalink] [raw]

Subject: RE: [PATCH] net: fec: remove deprecated IRQF_DISABLED

From: Michael Opdenacker [mailto:[email protected]]
Data: Friday, September 13, 2013 11:45 AM

> To: [email protected]; Estevam Fabio-R49496
> Cc: [email protected]; Duan Fugang-B38611; [email protected];
> [email protected]; [email protected]; Michael Opdenacker
> Subject: [PATCH] net: fec: remove deprecated IRQF_DISABLED
>
> This patch proposes to remove the IRQF_DISABLED flag from
> drivers/net/ethernet/freescale/fec_main.c
>
> It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker <[email protected]>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index f9aacf5..b2793b9 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -2199,7 +2199,7 @@ fec_probe(struct platform_device *pdev)
> goto failed_irq;
> }
> ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt,
> - IRQF_DISABLED, pdev->name, ndev);
> + 0, pdev->name, ndev);
> if (ret)
> goto failed_irq;

Can you remove the flag for all net driver such as:

/linux-next/linux-2.6$ grep -nr "IRQF_DISABLED" drivers/net/ethernet/
drivers/net/ethernet/adi/bfin_mac.c:533: IRQF_DISABLED, "EMAC_WAKE", dev);
drivers/net/ethernet/adi/bfin_mac.c:1689: IRQF_DISABLED, "EMAC_RX", ndev);
drivers/net/ethernet/lantiq_etop.c:285: request_irq(irq, ltq_etop_dma_irq, IRQF_DISABLED,
drivers/net/ethernet/lantiq_etop.c:294: request_irq(irq, ltq_etop_dma_irq, IRQF_DISABLED,
drivers/net/ethernet/micrel/ks8851_mll.c:918:#define KS_INT_FLAGS (IRQF_DISABLED|IRQF_TRIGGER_LOW)
drivers/net/ethernet/pasemi/pasemi_mac.c:1222: ret = request_irq(mac->tx->chan.irq, pasemi_mac_tx_intr, IRQF_DISABLED,
drivers/net/ethernet/pasemi/pasemi_mac.c:1233: ret = request_irq(mac->rx->chan.irq, pasemi_mac_rx_intr, IRQF_DISABLED,
drivers/net/ethernet/amd/sun3lance.c:361: if (request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev) < 0) {
drivers/net/ethernet/dec/tulip/de4x5.c:356: Added IRQF_DISABLED temporary fix from
drivers/net/ethernet/dec/tulip/de4x5.c:1324: if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,
drivers/net/ethernet/freescale/fec_main.c:2212: IRQF_DISABLED, pdev->name, ndev);
drivers/net/ethernet/smsc/smc91x.h:274:#define SMC_IRQ_FLAGS (IRQF_DISABLED)
drivers/net/ethernet/smsc/smsc9420.c:1359: result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,
drivers/net/ethernet/ibm/ehea/ehea_main.c:1288: IRQF_DISABLED, port->int_aff_name, port);
drivers/net/ethernet/ibm/ehea/ehea_main.c:1306: IRQF_DISABLED, pr->int_send_name,
drivers/net/ethernet/ibm/ehea/ehea_main.c:3323: ehea_interrupt_neq, IRQF_DISABLED,
drivers/net/ethernet/korina.c:999: IRQF_DISABLED, "Korina ethernet Rx", dev);
drivers/net/ethernet/korina.c:1006: IRQF_DISABLED, "Korina ethernet Tx", dev);
drivers/net/ethernet/korina.c:1015: IRQF_DISABLED, "Ethernet Overflow", dev);
drivers/net/ethernet/korina.c:1024: IRQF_DISABLED, "Ethernet Underflow", dev);
drivers/net/ethernet/marvell/pxa168_eth.c:1127: IRQF_DISABLED, dev->name, dev);
drivers/net/ethernet/natsemi/jazzsonic.c:86: retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
drivers/net/ethernet/natsemi/xtsonic.c:98: retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1729: IRQF_DISABLED, netdev->name, card);
drivers/net/ethernet/hp/hp100.c:1100: HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED,
drivers/net/ethernet/broadcom/bcm63xx_enet.c:929: ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
drivers/net/ethernet/broadcom/bcm63xx_enet.c:935: IRQF_DISABLED, dev->name, dev);
drivers/net/ethernet/broadcom/bcm63xx_enet.c:2159: IRQF_DISABLED, dev->name, dev);
drivers/net/ethernet/broadcom/bcm63xx_enet.c:2165: IRQF_DISABLED, dev->name, dev);

Thanks,
Andy

2013-09-13 06:06:40

by Michael Opdenacker

[permalink] [raw]

Subject: Re: [PATCH] net: fec: remove deprecated IRQF_DISABLED

Hi Andy,

Thank you for your time reviewing this patch.
On 09/13/2013 06:45 AM, Duan Fugang-B38611 >
> Can you remove the flag for all net >
> /linux-next/linux-2.6$ grep -nr "IRQF_DISABLED" > drivers/net/ethernet/adi/bfin_mac.c:533: > drivers/net/ethernet/adi/bfin_mac.c:1689: > drivers/net/ethernet/lantiq_etop.c:285: > drivers/net/ethernet/lantiq_etop.c:294: > drivers/net/ethernet/micrel/ks8851_mll.c:918:#define > drivers/net/ethernet/pasemi/pasemi_mac.c:1222: > drivers/net/ethernet/pasemi/pasemi_mac.c:1233: > drivers/net/ethernet/amd/sun3lance.c:361: > drivers/net/ethernet/dec/tulip/de4x5.c:356: > drivers/net/ethernet/dec/tulip/de4x5.c:1324: > drivers/net/ethernet/freescale/fec_main.c:2212: > drivers/net/ethernet/smsc/smc91x.h:274:#define > drivers/net/ethernet/smsc/smsc9420.c:1359: > drivers/net/ethernet/ibm/ehea/ehea_main.c:1288: > drivers/net/ethernet/ibm/ehea/ehea_main.c:1306: > drivers/net/ethernet/ibm/ehea/ehea_main.c:3323: > drivers/net/ethernet/korina.c:999: > drivers/net/ethernet/korina.c:1006: > drivers/net/ethernet/korina.c:1015: > drivers/net/ethernet/korina.c:1024: > drivers/net/ethernet/marvell/pxa168_eth.c:1127: > drivers/net/ethernet/natsemi/jazzsonic.c:86: > drivers/net/ethernet/natsemi/xtsonic.c:98: > drivers/net/ethernet/toshiba/ps3_gelic_net.c:1729: > drivers/net/ethernet/hp/hp100.c:1100: > drivers/net/ethernet/broadcom/bcm63xx_enet.c:929: > drivers/net/ethernet/broadcom/bcm63xx_enet.c:935: > drivers/net/ethernet/broadcom/bcm63xx_enet.c:2159: > drivers/net/ethernet/broadcom/bcm63xx_enet.c:2165: Already done, through separate patches. Dave Miller.

Cheers,

Michael.

--
Michael Opdenacker, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free- +33 484 258 098
/> wrote:
driver such as:
drivers/net/ethernet/
IRQF_DISABLED, "EMAC_WAKE", dev);
IRQF_DISABLED, "EMAC_RX", ndev);
request_irq(irq, ltq_etop_dma_irq, IRQF_DISABLED,
request_irq(irq, ltq_etop_dma_irq, IRQF_DISABLED,
KS_INT_FLAGS (IRQF_DISABLED|IRQF_TRIGGER_LOW)
ret = request_irq(mac->tx->chan.irq, pasemi_mac_tx_intr, IRQF_DISABLED,
ret = request_irq(mac->rx->chan.irq, pasemi_mac_rx_intr, IRQF_DISABLED,
if (request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev) < 0) {
Added IRQF_DISABLED temporary fix from
if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,
IRQF_DISABLED, pdev->name, ndev);
SMC_IRQ_FLAGS (IRQF_DISABLED)
result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,
IRQF_DISABLED, port->int_aff_name, port);
IRQF_DISABLED, pr->int_send_name,
ehea_interrupt_neq, IRQF_DISABLED,
IRQF_DISABLED, "Korina ethernet Rx", dev);
IRQF_DISABLED, "Korina ethernet Tx", dev);
IRQF_DISABLED, "Ethernet Overflow", dev);
IRQF_DISABLED, "Ethernet Underflow", dev);
IRQF_DISABLED, dev->name, dev);
retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
IRQF_DISABLED, netdev->name, card);
HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED,
ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
IRQF_DISABLED, dev->name, dev);
IRQF_DISABLED, dev->name, dev);
IRQF_DISABLED, dev->name, dev);
Some have already been merged by
/> electrons.com

2013-09-16 04:55:24

by David Miller

[permalink] [raw]

Subject: Re: [PATCH] net: fec: remove deprecated IRQF_DISABLED

From: Michael Opdenacker <[email protected]>
Date: Fri, 13 Sep 2013 05:44:38 +0200

> This patch proposes to remove the IRQF_DISABLED flag from
> drivers/net/ethernet/freescale/fec_main.c
>
> It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker <[email protected]>

Applied.