@@ -1089,25 +1089,24 @@ bfad_intx(int irq, void *dev_id)
{
struct bfad_s *bfad = dev_id;
struct list_head doneq;
- unsigned long flags;
bfa_boolean_t rc;
- spin_lock_irqsave(&bfad->bfad_lock, flags);
+ spin_lock(&bfad->bfad_lock);
rc = bfa_intx(&bfad->bfa);
if (!rc) {
- spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+ spin_unlock(&bfad->bfad_lock);
return IRQ_NONE;
}
bfa_comp_deq(&bfad->bfa, &doneq);
- spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+ spin_unlock(&bfad->bfad_lock);
if (!list_empty(&doneq)) {
bfa_comp_process(&bfad->bfa, &doneq);
- spin_lock_irqsave(&bfad->bfad_lock, flags);
+ spin_lock(&bfad->bfad_lock);
bfa_comp_free(&bfad->bfa, &doneq);
- spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+ spin_unlock(&bfad->bfad_lock);
}
return IRQ_HANDLED;
@@ -1120,20 +1119,19 @@ bfad_msix(int irq, void *dev_id)
struct bfad_msix_s *vec = dev_id;
struct bfad_s *bfad = vec->bfad;
struct list_head doneq;
- unsigned long flags;
- spin_lock_irqsave(&bfad->bfad_lock, flags);
+ spin_lock(&bfad->bfad_lock);
bfa_msix(&bfad->bfa, vec->msix.entry);
bfa_comp_deq(&bfad->bfa, &doneq);
- spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+ spin_unlock(&bfad->bfad_lock);
if (!list_empty(&doneq)) {
bfa_comp_process(&bfad->bfa, &doneq);
- spin_lock_irqsave(&bfad->bfad_lock, flags);
+ spin_lock(&bfad->bfad_lock);
bfa_comp_free(&bfad->bfa, &doneq);
- spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+ spin_unlock(&bfad->bfad_lock);
}
return IRQ_HANDLED;
It is redundant to do irqsave and irqrestore in hardIRQ context, where it has been in a irq-disabled context. Signed-off-by: Xiaofei Tan <tanxiaofei@huawei.com> --- drivers/scsi/bfa/bfad.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)