[PATCH 0/9] move spin_lock_irqsave to spin_lock in interrupt handler

[PATCH 0/9] move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Tuo Cao (9):
  scsi: 53c700: move spin_lock_irqsave to spin_lock in interrupt handler
  scsi: a100u2w: move spin_lock_irqsave to spin_lock in interrupt
    handler
  scsi: a2091: move spin_lock_irqsave to spin_lock in interrupt handler
  scsi: a3000: move spin_lock_irqsave to spin_lock in interrupt handler
  scsi: BusLogic: move spin_lock_irqsave to spin_lock in interrupt
    handler
  scsi: advansys: move spin_lock_irqsave to spin_lock in interrupt
    handler
  scsi: aha1542: move spin_lock_irqsave to spin_lock in interrupt
    handler
  scsi: aha1740: move spin_lock_irqsave to spin_lock in interrupt
    handler
  scsi: bfad: move spin_lock_irqsave to spin_lock in interrupt handler

 drivers/scsi/53c700.c   |  5 ++---
 drivers/scsi/BusLogic.c |  5 ++---
 drivers/scsi/a100u2w.c  |  5 ++---
 drivers/scsi/a2091.c    |  5 ++---
 drivers/scsi/a3000.c    |  5 ++---
 drivers/scsi/advansys.c |  5 ++---
 drivers/scsi/aha1542.c  |  7 +++----
 drivers/scsi/aha1740.c  |  5 ++---
 drivers/scsi/bfa/bfad.c | 20 +++++++++-----------
 9 files changed, 26 insertions(+), 36 deletions(-)

-- 
2.17.1

[PATCH 1/9] scsi: 53c700: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/53c700.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index e1e4f9d10887..55dc0fb7943e 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1490,7 +1490,6 @@ NCR_700_intr(int irq, void *dev_id)
 	__u8 istat;
 	__u32 resume_offset = 0;
 	__u8 pun = 0xff, lun = 0xff;
-	unsigned long flags;
 	int handled = 0;
 
 	/* Use the host lock to serialise access to the 53c700
@@ -1498,7 +1497,7 @@ NCR_700_intr(int irq, void *dev_id)
 	 * lock to enter the done routines.  When that happens, we
 	 * need to ensure that for this driver, the host lock and the
 	 * queue lock point to the same thing. */
-	spin_lock_irqsave(host->host_lock, flags);
+	spin_lock(host->host_lock);
 	if((istat = NCR_700_readb(host, ISTAT_REG))
 	      & (SCSI_INT_PENDING | DMA_INT_PENDING)) {
 		__u32 dsps;
@@ -1746,7 +1745,7 @@ NCR_700_intr(int irq, void *dev_id)
 		}
 	}
  out_unlock:
-	spin_unlock_irqrestore(host->host_lock, flags);
+	spin_unlock(host->host_lock);
 	return IRQ_RETVAL(handled);
 }
 
-- 
2.17.1

[PATCH 2/9] scsi: a100u2w: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/a100u2w.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index d02eb5b213d0..391c094758c0 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1055,12 +1055,11 @@ static irqreturn_t inia100_intr(int irqno, void *devid)
 {
 	struct Scsi_Host *shost = (struct Scsi_Host *)devid;
 	struct orc_host *host = (struct orc_host *)shost->hostdata;
-	unsigned long flags;
 	irqreturn_t res;
 
-	spin_lock_irqsave(shost->host_lock, flags);
+	spin_lock(shost->host_lock);
 	res = orc_interrupt(host);
-	spin_unlock_irqrestore(shost->host_lock, flags);
+	spin_unlock(shost->host_lock);
 
 	return res;
 }
-- 
2.17.1

[PATCH 3/9] scsi: a2091: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/a2091.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 74312400468b..0a79ba0b20f7 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -34,14 +34,13 @@ static irqreturn_t a2091_intr(int irq, void *data)
 	struct Scsi_Host *instance = data;
 	struct a2091_hostdata *hdata = shost_priv(instance);
 	unsigned int status = hdata->regs->ISTR;
-	unsigned long flags;
 
 	if (!(status & (ISTR_INT_F | ISTR_INT_P)) || !(status & ISTR_INTS))
 		return IRQ_NONE;
 
-	spin_lock_irqsave(instance->host_lock, flags);
+	spin_lock(instance->host_lock);
 	wd33c93_intr(instance);
-	spin_unlock_irqrestore(instance->host_lock, flags);
+	spin_unlock(instance->host_lock);
 	return IRQ_HANDLED;
 }
 
-- 
2.17.1

[PATCH 4/9] scsi: a3000: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/a3000.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index 2c5cb1a02e86..f34c436459d5 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -36,14 +36,13 @@ static irqreturn_t a3000_intr(int irq, void *data)
 	struct Scsi_Host *instance = data;
 	struct a3000_hostdata *hdata = shost_priv(instance);
 	unsigned int status = hdata->regs->ISTR;
-	unsigned long flags;
 
 	if (!(status & ISTR_INT_P))
 		return IRQ_NONE;
 	if (status & ISTR_INTS) {
-		spin_lock_irqsave(instance->host_lock, flags);
+		spin_lock(instance->host_lock);
 		wd33c93_intr(instance);
-		spin_unlock_irqrestore(instance->host_lock, flags);
+		spin_unlock(instance->host_lock);
 		return IRQ_HANDLED;
 	}
 	pr_warn("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
-- 
2.17.1

[PATCH 5/9] scsi: BusLogic: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/BusLogic.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index f2abffce2659..e2eb020966cd 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2739,11 +2739,10 @@ static void blogic_process_ccbs(struct blogic_adapter *adapter)
 static irqreturn_t blogic_inthandler(int irq_ch, void *devid)
 {
 	struct blogic_adapter *adapter = (struct blogic_adapter *) devid;
-	unsigned long processor_flag;
 	/*
 	   Acquire exclusive access to Host Adapter.
 	 */
-	spin_lock_irqsave(adapter->scsi_host->host_lock, processor_flag);
+	spin_lock(adapter->scsi_host->host_lock);
 	/*
 	   Handle Interrupts appropriately for each Host Adapter type.
 	 */
@@ -2811,7 +2810,7 @@ static irqreturn_t blogic_inthandler(int irq_ch, void *devid)
 	/*
 	   Release exclusive access to Host Adapter.
 	 */
-	spin_unlock_irqrestore(adapter->scsi_host->host_lock, processor_flag);
+	spin_unlock(adapter->scsi_host->host_lock);
 	return IRQ_HANDLED;
 }
 
-- 
2.17.1

[PATCH 6/9] scsi: advansys: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/advansys.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index f301aec044bb..2f402f73ae4e 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7137,10 +7137,9 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)
 	struct Scsi_Host *shost = dev_id;
 	struct asc_board *boardp = shost_priv(shost);
 	irqreturn_t result = IRQ_NONE;
-	unsigned long flags;
 
 	ASC_DBG(2, "boardp 0x%p\n", boardp);
-	spin_lock_irqsave(shost->host_lock, flags);
+	spin_lock(shost->host_lock);
 	if (ASC_NARROW_BOARD(boardp)) {
 		if (AscIsIntPending(shost->io_port)) {
 			result = IRQ_HANDLED;
@@ -7155,7 +7154,7 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)
 			ASC_STATS(shost, interrupt);
 		}
 	}
-	spin_unlock_irqrestore(shost->host_lock, flags);
+	spin_unlock(shost->host_lock);
 
 	ASC_DBG(1, "end\n");
 	return result;
-- 
2.17.1

[PATCH 7/9] scsi: aha1542: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/aha1542.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 552ca95157da..b49082bc5b54 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -281,7 +281,6 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 	struct aha1542_hostdata *aha1542 = shost_priv(sh);
 	int errstatus, mbi, mbo, mbistatus;
 	int number_serviced;
-	unsigned long flags;
 	struct scsi_cmnd *tmp_cmd;
 	int flag;
 	struct mailbox *mb = aha1542->mb;
@@ -306,7 +305,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 #endif
 	number_serviced = 0;
 
-	spin_lock_irqsave(sh->host_lock, flags);
+	spin_lock(sh->host_lock);
 	while (1) {
 		flag = inb(INTRFLAGS(sh->io_port));
 
@@ -339,7 +338,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 		} while (mbi != aha1542->aha1542_last_mbi_used);
 
 		if (mb[mbi].status == 0) {
-			spin_unlock_irqrestore(sh->host_lock, flags);
+			spin_unlock(sh->host_lock);
 			/* Hmm, no mail.  Must have read it the last time around */
 			if (!number_serviced)
 				shost_printk(KERN_WARNING, sh, "interrupt received, but no mail.\n");
@@ -367,7 +366,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 		tmp_cmd = aha1542->int_cmds[mbo];
 
 		if (!tmp_cmd) {
-			spin_unlock_irqrestore(sh->host_lock, flags);
+			spin_unlock(sh->host_lock);
 			shost_printk(KERN_WARNING, sh, "Unexpected interrupt\n");
 			shost_printk(KERN_WARNING, sh, "tarstat=%x, hastat=%x idlun=%x ccb#=%d\n", ccb[mbo].tarstat,
 			       ccb[mbo].hastat, ccb[mbo].idlun, mbo);
-- 
2.17.1

[PATCH 8/9] scsi: aha1740: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/aha1740.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 134255751819..c4f46ab927d1 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -218,14 +218,13 @@ static irqreturn_t aha1740_intr_handle(int irq, void *dev_id)
 	struct ecb *ecbptr;
 	struct scsi_cmnd *SCtmp;
 	unsigned int base;
-	unsigned long flags;
 	int handled = 0;
 	struct aha1740_sg *sgptr;
 	struct eisa_device *edev;
 	
 	if (!host)
 		panic("aha1740.c: Irq from unknown host!\n");
-	spin_lock_irqsave(host->host_lock, flags);
+	spin_lock(host->host_lock);
 	base = host->io_port;
 	number_serviced = 0;
 	edev = HOSTDATA(host)->edev;
@@ -315,7 +314,7 @@ static irqreturn_t aha1740_intr_handle(int irq, void *dev_id)
 		number_serviced++;
 	}
 
-	spin_unlock_irqrestore(host->host_lock, flags);
+	spin_unlock(host->host_lock);
 	return IRQ_RETVAL(handled);
 }
 
-- 
2.17.1

[PATCH 9/9] scsi: bfad: move spin_lock_irqsave to spin_lock in interrupt handler

[Tuo Cao]

it is unnecessary to call spin_lock_irqsave in a interrupt handler.

Signed-off-by: Tuo Cao <91tuocao@gmail.com>
---
 drivers/scsi/bfa/bfad.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index e5aa982ffedc..3191377d543b 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1086,25 +1086,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;
@@ -1117,20 +1116,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;
-- 
2.17.1