* [PATCH] net: smsc: remove deprecated IRQF_DISABLED
@ 2013-09-13 4:27 Michael Opdenacker
2013-09-13 8:56 ` Will Deacon
2013-09-16 4:56 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Michael Opdenacker @ 2013-09-13 4:27 UTC (permalink / raw)
To: steve.glendinning, davem
Cc: netdev, linux-kernel, will.deacon, Michael Opdenacker
This patch proposes to remove the IRQF_DISABLED flag from
code in drivers/net/ethernet/smsc/
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>
---
drivers/net/ethernet/smsc/smc91x.h | 2 +-
drivers/net/ethernet/smsc/smsc9420.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 370e13d..5730fe2 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -271,7 +271,7 @@ static inline void mcf_outsw(void *a, unsigned char *p, int l)
#define SMC_insw(a, r, p, l) mcf_insw(a + r, p, l)
#define SMC_outsw(a, r, p, l) mcf_outsw(a + r, p, l)
-#define SMC_IRQ_FLAGS (IRQF_DISABLED)
+#define SMC_IRQ_FLAGS 0
#else
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index ffa5c4a..5f9e79f 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1356,8 +1356,7 @@ static int smsc9420_open(struct net_device *dev)
smsc9420_reg_write(pd, INT_STAT, 0xFFFFFFFF);
smsc9420_pci_flush_write(pd);
- result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,
- DRV_NAME, pd);
+ result = request_irq(irq, smsc9420_isr, IRQF_SHARED, DRV_NAME, pd);
if (result) {
smsc_warn(IFUP, "Unable to use IRQ = %d", irq);
result = -ENODEV;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: smsc: remove deprecated IRQF_DISABLED
2013-09-13 4:27 [PATCH] net: smsc: remove deprecated IRQF_DISABLED Michael Opdenacker
@ 2013-09-13 8:56 ` Will Deacon
2013-09-16 4:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Will Deacon @ 2013-09-13 8:56 UTC (permalink / raw)
To: Michael Opdenacker
Cc: steve.glendinning@shawell.net, davem@davemloft.net,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davidb
[adding David Brown]
On Fri, Sep 13, 2013 at 05:27:47AM +0100, Michael Opdenacker wrote:
> This patch proposes to remove the IRQF_DISABLED flag from
> code in drivers/net/ethernet/smsc/
>
> 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>
> ---
> drivers/net/ethernet/smsc/smc91x.h | 2 +-
> drivers/net/ethernet/smsc/smsc9420.c | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
> index 370e13d..5730fe2 100644
> --- a/drivers/net/ethernet/smsc/smc91x.h
> +++ b/drivers/net/ethernet/smsc/smc91x.h
> @@ -271,7 +271,7 @@ static inline void mcf_outsw(void *a, unsigned char *p, int l)
> #define SMC_insw(a, r, p, l) mcf_insw(a + r, p, l)
> #define SMC_outsw(a, r, p, l) mcf_outsw(a + r, p, l)
>
> -#define SMC_IRQ_FLAGS (IRQF_DISABLED)
> +#define SMC_IRQ_FLAGS 0
After this change, the only machine that defines the flags to anything other
than IRQF_TRIGGER_RISING is MSM, which uses IRQF_TRIGGER_HIGH. David: do
you actually need this? The irq_chip code under mach-msm doesn't seem to
distinguish between the two.
Will
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: smsc: remove deprecated IRQF_DISABLED
2013-09-13 4:27 [PATCH] net: smsc: remove deprecated IRQF_DISABLED Michael Opdenacker
2013-09-13 8:56 ` Will Deacon
@ 2013-09-16 4:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-09-16 4:56 UTC (permalink / raw)
To: michael.opdenacker; +Cc: steve.glendinning, netdev, linux-kernel, will.deacon
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Date: Fri, 13 Sep 2013 06:27:47 +0200
> This patch proposes to remove the IRQF_DISABLED flag from
> code in drivers/net/ethernet/smsc/
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-16 4:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-13 4:27 [PATCH] net: smsc: remove deprecated IRQF_DISABLED Michael Opdenacker
2013-09-13 8:56 ` Will Deacon
2013-09-16 4:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).