Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fa46e1 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[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: default avatarJeff Garzik <jeff@garzik.org>
parent 5a44efff

drivers/scsi/sata_nv.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

}