aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-07 18:15:17 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-09-05 13:21:00 -0400
commitec21b3b0dbbaf5965f6b508cb6b48d9fe5bb6ab5 (patch)
tree68f7925a20de12d5a1da4fc7c8bcdac05bf67ec0 /drivers/scsi/lpfc
parent7968f1944c9d6c83683e87fd2ede977ccfd29285 (diff)
[SCSI] lpfc: change spin_lock_irq() to spin_lock()
In lpfc_cleanup_pending_mbox() we already have IRQs disabled so we don't need to disable them again. Also in lpfc_sli_intr_handler() there is a typo where it has spin_unlock_irq() instead of just spin_unlock(). Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index fb8905f893f5..23a47e536858 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -8476,7 +8476,7 @@ lpfc_sli_intr_handler(int irq, void *dev_id)
8476 * If there is deferred error attention, do not check for any interrupt. 8476 * If there is deferred error attention, do not check for any interrupt.
8477 */ 8477 */
8478 if (unlikely(phba->hba_flag & DEFER_ERATT)) { 8478 if (unlikely(phba->hba_flag & DEFER_ERATT)) {
8479 spin_unlock_irq(&phba->hbalock); 8479 spin_unlock(&phba->hbalock);
8480 return IRQ_NONE; 8480 return IRQ_NONE;
8481 } 8481 }
8482 8482
@@ -12827,9 +12827,9 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
12827 } 12827 }
12828 ndlp = (struct lpfc_nodelist *) mb->context2; 12828 ndlp = (struct lpfc_nodelist *) mb->context2;
12829 if (ndlp) { 12829 if (ndlp) {
12830 spin_lock_irq(shost->host_lock); 12830 spin_lock(shost->host_lock);
12831 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL; 12831 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
12832 spin_unlock_irq(shost->host_lock); 12832 spin_unlock(shost->host_lock);
12833 lpfc_nlp_put(ndlp); 12833 lpfc_nlp_put(ndlp);
12834 mb->context2 = NULL; 12834 mb->context2 = NULL;
12835 } 12835 }
@@ -12845,9 +12845,9 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
12845 if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) { 12845 if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
12846 ndlp = (struct lpfc_nodelist *) mb->context2; 12846 ndlp = (struct lpfc_nodelist *) mb->context2;
12847 if (ndlp) { 12847 if (ndlp) {
12848 spin_lock_irq(shost->host_lock); 12848 spin_lock(shost->host_lock);
12849 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL; 12849 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
12850 spin_unlock_irq(shost->host_lock); 12850 spin_unlock(shost->host_lock);
12851 lpfc_nlp_put(ndlp); 12851 lpfc_nlp_put(ndlp);
12852 mb->context2 = NULL; 12852 mb->context2 = NULL;
12853 } 12853 }