diff options
| author |   William Hubbs <w.d.hubbs@gmail.com> | 2013-05-13 00:02:59 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:11:09 -0700 |
| commit | 995b904040dfc9e6486766a86b9877f62bd2995b (patch) | |
| tree | bcc3e1a010a505f9330f3b3294e653457a9b133c /drivers/staging/speakup/speakup_acntpc.c | |
| parent | staging: speakup: serialio: remove custom locking macros (diff) | |
| download | linux-dev-995b904040dfc9e6486766a86b9877f62bd2995b.tar.xz linux-dev-995b904040dfc9e6486766a86b9877f62bd2995b.zip | |
staging: speakup: acntpc: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/speakup/speakup_acntpc.c')
| -rw-r--r-- | drivers/staging/speakup/speakup_acntpc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/speakup/speakup_acntpc.c b/drivers/staging/speakup/speakup_acntpc.c index 1c1f0d560449..87a508df7efb 100644 --- a/drivers/staging/speakup/speakup_acntpc.c +++ b/drivers/staging/speakup/speakup_acntpc.c @@ -186,26 +186,26 @@ static void do_catch_up(struct spk_synth *synth) delay_time = spk_get_var(DELAY); full_time = spk_get_var(FULL); - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); jiffy_delta_val = jiffy_delta->u.n.value; - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); jiff_max = jiffies + jiffy_delta_val; while (!kthread_should_stop()) { - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); if (speakup_info.flushing) { speakup_info.flushing = 0; - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); synth->flush(synth); continue; } if (synth_buffer_empty()) { - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); break; } set_current_state(TASK_INTERRUPTIBLE); full_time_val = full_time->u.n.value; - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (synth_full()) { schedule_timeout(msecs_to_jiffies(full_time_val)); continue; @@ -217,9 +217,9 @@ static void do_catch_up(struct spk_synth *synth) break; udelay(1); } - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); ch = synth_buffer_getc(); - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (ch == '\n') ch = PROCSPEECH; outb_p(ch, speakup_info.port_tts); @@ -231,10 +231,10 @@ static void do_catch_up(struct spk_synth *synth) udelay(1); } outb_p(PROCSPEECH, speakup_info.port_tts); - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); jiffy_delta_val = jiffy_delta->u.n.value; delay_time_val = delay_time->u.n.value; - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); schedule_timeout(msecs_to_jiffies(delay_time_val)); jiff_max = jiffies+jiffy_delta_val; } |