hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: speakup: decpc: remove custom locking macros 

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
William Hubbs 2013-05-13 13:31:37 -05:00 committed by Greg Kroah-Hartman
parent b4b93e32d7
commit 4d888b292a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/speakup/speakup_decpc.c
View File

@ -377,27 +377,27 @@ static void do_catch_up(struct spk_synth *synth)
jiffy_delta = spk_get_var(JIFFY); jiffy_delta = spk_get_var(JIFFY);
delay_time = spk_get_var(DELAY); delay_time = spk_get_var(DELAY);
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
jiffy_delta_val = jiffy_delta->u.n.value; jiffy_delta_val = jiffy_delta->u.n.value;
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
jiff_max = jiffies + jiffy_delta_val; jiff_max = jiffies + jiffy_delta_val;
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
if (speakup_info.flushing) { if (speakup_info.flushing) {
speakup_info.flushing = 0; speakup_info.flushing = 0;
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
synth->flush(synth); synth->flush(synth);
continue; continue;
} }
if (synth_buffer_empty()) { if (synth_buffer_empty()) {
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
break; break;
} }
ch = synth_buffer_peek(); ch = synth_buffer_peek();
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
delay_time_val = delay_time->u.n.value; delay_time_val = delay_time->u.n.value;
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '\n') if (ch == '\n')
ch = 0x0D; ch = 0x0D;
if (dt_sendchar(ch)) { if (dt_sendchar(ch)) {
@ -405,9 +405,9 @@ static void do_catch_up(struct spk_synth *synth)
continue; continue;
} }
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
synth_buffer_getc(); synth_buffer_getc();
spk_unlock(flags); spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '[') if (ch == '[')
in_escape = 1; in_escape = 1;
else if (ch == ']') else if (ch == ']')
@ -418,10 +418,10 @@ static void do_catch_up(struct spk_synth *synth)
if (jiffies >= jiff_max) { if (jiffies >= jiff_max) {
if (!in_escape) if (!in_escape)
dt_sendchar(PROCSPEECH); dt_sendchar(PROCSPEECH);
spk_lock(flags); spin_lock_irqsave(&speakup_info.spinlock, flags);
jiffy_delta_val = jiffy_delta->u.n.value; jiffy_delta_val = jiffy_delta->u.n.value;
delay_time_val = delay_time->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 schedule_timeout(msecs_to_jiffies
(delay_time_val)); (delay_time_val));
jiff_max = jiffies + jiffy_delta_val; jiff_max = jiffies + jiffy_delta_val;