|
@@ -840,11 +840,10 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
|
|
{
|
|
{
|
|
struct nvt_dev *nvt = data;
|
|
struct nvt_dev *nvt = data;
|
|
u8 status, iren;
|
|
u8 status, iren;
|
|
- unsigned long flags;
|
|
|
|
|
|
|
|
nvt_dbg_verbose("%s firing", __func__);
|
|
nvt_dbg_verbose("%s firing", __func__);
|
|
|
|
|
|
- spin_lock_irqsave(&nvt->lock, flags);
|
|
|
|
|
|
+ spin_lock(&nvt->lock);
|
|
|
|
|
|
/*
|
|
/*
|
|
* Get IR Status register contents. Write 1 to ack/clear
|
|
* Get IR Status register contents. Write 1 to ack/clear
|
|
@@ -866,7 +865,7 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
|
|
* logical device is being disabled.
|
|
* logical device is being disabled.
|
|
*/
|
|
*/
|
|
if (status == 0xff && iren == 0xff) {
|
|
if (status == 0xff && iren == 0xff) {
|
|
- spin_unlock_irqrestore(&nvt->lock, flags);
|
|
|
|
|
|
+ spin_unlock(&nvt->lock);
|
|
nvt_dbg_verbose("Spurious interrupt detected");
|
|
nvt_dbg_verbose("Spurious interrupt detected");
|
|
return IRQ_HANDLED;
|
|
return IRQ_HANDLED;
|
|
}
|
|
}
|
|
@@ -875,7 +874,7 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
|
|
* status bit whether the related interrupt source is enabled
|
|
* status bit whether the related interrupt source is enabled
|
|
*/
|
|
*/
|
|
if (!(status & iren)) {
|
|
if (!(status & iren)) {
|
|
- spin_unlock_irqrestore(&nvt->lock, flags);
|
|
|
|
|
|
+ spin_unlock(&nvt->lock);
|
|
nvt_dbg_verbose("%s exiting, IRSTS 0x0", __func__);
|
|
nvt_dbg_verbose("%s exiting, IRSTS 0x0", __func__);
|
|
return IRQ_NONE;
|
|
return IRQ_NONE;
|
|
}
|
|
}
|
|
@@ -923,7 +922,7 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- spin_unlock_irqrestore(&nvt->lock, flags);
|
|
|
|
|
|
+ spin_unlock(&nvt->lock);
|
|
|
|
|
|
nvt_dbg_verbose("%s done", __func__);
|
|
nvt_dbg_verbose("%s done", __func__);
|
|
return IRQ_HANDLED;
|
|
return IRQ_HANDLED;
|