From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 20 Jun 2006 09:08:44 +0000 (-0400)
Subject: [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler
X-Git-Tag: v2.6.18-rc1~1079^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5fa46e175ccd02803031ea071060cdb01521736;p=linux-2.6

[libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler

We don't need to use the heavier spin lock in the irq handler.

It's quite possible we can do this in nv_generic_interrupt() as well,
but I didn't take the time to pursue that train of thought.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 19deaa42fb..be8650f170 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -371,14 +371,13 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance,
 				    struct pt_regs *regs)
 {
 	struct ata_host_set *host_set = dev_instance;
-	unsigned long flags;
 	u8 irq_stat;
 	irqreturn_t ret;
 
-	spin_lock_irqsave(&host_set->lock, flags);
+	spin_lock(&host_set->lock);
 	irq_stat = inb(host_set->ports[0]->ioaddr.scr_addr + NV_INT_STATUS);
 	ret = nv_do_interrupt(host_set, irq_stat);
-	spin_unlock_irqrestore(&host_set->lock, flags);
+	spin_unlock(&host_set->lock);
 
 	return ret;
 }
@@ -387,14 +386,13 @@ static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance,
 				      struct pt_regs *regs)
 {
 	struct ata_host_set *host_set = dev_instance;
-	unsigned long flags;
 	u8 irq_stat;
 	irqreturn_t ret;
 
-	spin_lock_irqsave(&host_set->lock, flags);
+	spin_lock(&host_set->lock);
 	irq_stat = readb(host_set->mmio_base + NV_INT_STATUS_CK804);
 	ret = nv_do_interrupt(host_set, irq_stat);
-	spin_unlock_irqrestore(&host_set->lock, flags);
+	spin_unlock(&host_set->lock);
 
 	return ret;
 }