diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-03-09 06:59:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-10 07:43:54 -0400 |
commit | 08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf (patch) | |
tree | 490d7ce329c913ec66418b361990153d0f881138 /drivers/net/qlge | |
parent | c9cf0a04a0c20c26388c51052296d774ec92e2bd (diff) |
qlge: Get rid of irqsave/restore in intr disable.
The completion interrupt disable routine is only called from the ISR, so
there is no need for irqsave/restore.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 8b6128e7f5c6..45ad4cc298bf 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -587,7 +587,6 @@ u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr) | |||
587 | static u32 ql_disable_completion_interrupt(struct ql_adapter *qdev, u32 intr) | 587 | static u32 ql_disable_completion_interrupt(struct ql_adapter *qdev, u32 intr) |
588 | { | 588 | { |
589 | u32 var = 0; | 589 | u32 var = 0; |
590 | unsigned long hw_flags; | ||
591 | struct intr_context *ctx; | 590 | struct intr_context *ctx; |
592 | 591 | ||
593 | /* HW disables for us if we're MSIX multi interrupts and | 592 | /* HW disables for us if we're MSIX multi interrupts and |
@@ -597,14 +596,14 @@ static u32 ql_disable_completion_interrupt(struct ql_adapter *qdev, u32 intr) | |||
597 | return 0; | 596 | return 0; |
598 | 597 | ||
599 | ctx = qdev->intr_context + intr; | 598 | ctx = qdev->intr_context + intr; |
600 | spin_lock_irqsave(&qdev->hw_lock, hw_flags); | 599 | spin_lock(&qdev->hw_lock); |
601 | if (!atomic_read(&ctx->irq_cnt)) { | 600 | if (!atomic_read(&ctx->irq_cnt)) { |
602 | ql_write32(qdev, INTR_EN, | 601 | ql_write32(qdev, INTR_EN, |
603 | ctx->intr_dis_mask); | 602 | ctx->intr_dis_mask); |
604 | var = ql_read32(qdev, STS); | 603 | var = ql_read32(qdev, STS); |
605 | } | 604 | } |
606 | atomic_inc(&ctx->irq_cnt); | 605 | atomic_inc(&ctx->irq_cnt); |
607 | spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); | 606 | spin_unlock(&qdev->hw_lock); |
608 | return var; | 607 | return var; |
609 | } | 608 | } |
610 | 609 | ||