summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-20 05:08:44 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-20 05:08:44 -0400
commitc5fa46e175ccd02803031ea071060cdb01521736 (patch)
tree5e6f49d86a2dcd069c45bfd434efd6d6fa311bea /drivers/scsi
parent5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced (diff)
downloadop-kernel-dev-c5fa46e175ccd02803031ea071060cdb01521736.zip
op-kernel-dev-c5fa46e175ccd02803031ea071060cdb01521736.tar.gz
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sata_nv.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 19deaa4..be8650f 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;
}
OpenPOWER on IntegriCloud