diff options
author | Phil Sutter <n0-1@freewrt.org> | 2009-01-15 00:51:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-15 11:28:21 -0500 |
commit | 1c5625cf0f121486abad4da0e0251ec67765aa95 (patch) | |
tree | eb3eb485d1d756434125c49333b85bde81117aea /drivers/net | |
parent | 5edc7668bbece4238a32943ae7a47135af076948 (diff) |
korina: do not use IRQF_SHARED with IRQF_DISABLED
As the kernel warning states: "IRQF_DISABLED is not guaranteed on shared
IRQs". Since these IRQs' values are hardcoded and my test system doesn't
show any shared use of IRQs at all, rather make them non-shared than
non-disabled.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/korina.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/korina.c b/drivers/net/korina.c index bd33fa915997..1d6e48e13366 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c | |||
@@ -1000,14 +1000,14 @@ static int korina_open(struct net_device *dev) | |||
1000 | * that handles the Done Finished | 1000 | * that handles the Done Finished |
1001 | * Ovr and Und Events */ | 1001 | * Ovr and Und Events */ |
1002 | ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt, | 1002 | ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt, |
1003 | IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Rx", dev); | 1003 | IRQF_DISABLED, "Korina ethernet Rx", dev); |
1004 | if (ret < 0) { | 1004 | if (ret < 0) { |
1005 | printk(KERN_ERR DRV_NAME "%s: unable to get Rx DMA IRQ %d\n", | 1005 | printk(KERN_ERR DRV_NAME "%s: unable to get Rx DMA IRQ %d\n", |
1006 | dev->name, lp->rx_irq); | 1006 | dev->name, lp->rx_irq); |
1007 | goto err_release; | 1007 | goto err_release; |
1008 | } | 1008 | } |
1009 | ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt, | 1009 | ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt, |
1010 | IRQF_SHARED | IRQF_DISABLED, "Korina ethernet Tx", dev); | 1010 | IRQF_DISABLED, "Korina ethernet Tx", dev); |
1011 | if (ret < 0) { | 1011 | if (ret < 0) { |
1012 | printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n", | 1012 | printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n", |
1013 | dev->name, lp->tx_irq); | 1013 | dev->name, lp->tx_irq); |
@@ -1016,7 +1016,7 @@ static int korina_open(struct net_device *dev) | |||
1016 | 1016 | ||
1017 | /* Install handler for overrun error. */ | 1017 | /* Install handler for overrun error. */ |
1018 | ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt, | 1018 | ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt, |
1019 | IRQF_SHARED | IRQF_DISABLED, "Ethernet Overflow", dev); | 1019 | IRQF_DISABLED, "Ethernet Overflow", dev); |
1020 | if (ret < 0) { | 1020 | if (ret < 0) { |
1021 | printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n", | 1021 | printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n", |
1022 | dev->name, lp->ovr_irq); | 1022 | dev->name, lp->ovr_irq); |
@@ -1025,7 +1025,7 @@ static int korina_open(struct net_device *dev) | |||
1025 | 1025 | ||
1026 | /* Install handler for underflow error. */ | 1026 | /* Install handler for underflow error. */ |
1027 | ret = request_irq(lp->und_irq, &korina_und_interrupt, | 1027 | ret = request_irq(lp->und_irq, &korina_und_interrupt, |
1028 | IRQF_SHARED | IRQF_DISABLED, "Ethernet Underflow", dev); | 1028 | IRQF_DISABLED, "Ethernet Underflow", dev); |
1029 | if (ret < 0) { | 1029 | if (ret < 0) { |
1030 | printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n", | 1030 | printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n", |
1031 | dev->name, lp->und_irq); | 1031 | dev->name, lp->und_irq); |