diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-13 00:16:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-15 22:01:06 -0400 |
commit | d8865d5bb92d0d362ed6904cb248776d4da6efbb (patch) | |
tree | 08284e4697da13e782a709d7949fd5fbd56db6e7 /drivers/net/ethernet/natsemi | |
parent | cfb9a514bc119e96c980115c055e8fd7e64a7abf (diff) |
net: natsemi: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from
code in drivers/net/ethernet/natsemi/
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/natsemi')
-rw-r--r-- | drivers/net/ethernet/natsemi/jazzsonic.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/natsemi/xtsonic.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c index c20766c2f65b..79257f71c5d9 100644 --- a/drivers/net/ethernet/natsemi/jazzsonic.c +++ b/drivers/net/ethernet/natsemi/jazzsonic.c | |||
@@ -83,8 +83,7 @@ static int jazzsonic_open(struct net_device* dev) | |||
83 | { | 83 | { |
84 | int retval; | 84 | int retval; |
85 | 85 | ||
86 | retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, | 86 | retval = request_irq(dev->irq, sonic_interrupt, 0, "sonic", dev); |
87 | "sonic", dev); | ||
88 | if (retval) { | 87 | if (retval) { |
89 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", | 88 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", |
90 | dev->name, dev->irq); | 89 | dev->name, dev->irq); |
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c index c2e0256fe3df..4da172ac5599 100644 --- a/drivers/net/ethernet/natsemi/xtsonic.c +++ b/drivers/net/ethernet/natsemi/xtsonic.c | |||
@@ -95,8 +95,7 @@ static int xtsonic_open(struct net_device *dev) | |||
95 | { | 95 | { |
96 | int retval; | 96 | int retval; |
97 | 97 | ||
98 | retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, | 98 | retval = request_irq(dev->irq, sonic_interrupt, 0, "sonic", dev); |
99 | "sonic", dev); | ||
100 | if (retval) { | 99 | if (retval) { |
101 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", | 100 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", |
102 | dev->name, dev->irq); | 101 | dev->name, dev->irq); |