diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2009-03-09 10:59:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-10 04:43:54 -0700 |
| commit | 08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf (patch) | |
| tree | 490d7ce329c913ec66418b361990153d0f881138 | |
| parent | c9cf0a04a0c20c26388c51052296d774ec92e2bd (diff) | |
| download | linux-stable-08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf.tar.gz linux-stable-08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf.tar.bz2 linux-stable-08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf.zip | |
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>
| -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) static u32 ql_disable_completion_interrupt(struct ql_adapter *qdev, u32 intr) { u32 var = 0; - unsigned long hw_flags; struct intr_context *ctx; /* 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) return 0; ctx = qdev->intr_context + intr; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock(&qdev->hw_lock); if (!atomic_read(&ctx->irq_cnt)) { ql_write32(qdev, INTR_EN, ctx->intr_dis_mask); var = ql_read32(qdev, STS); } atomic_inc(&ctx->irq_cnt); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock(&qdev->hw_lock); return var; } |