Commit b4b93e32 authored by William Hubbs's avatar William Hubbs Committed by Greg Kroah-Hartman
Browse files

staging: speakup: decext: remove custom locking macros 



Signed-off-by: default avatarWilliam Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ca4dbe3

drivers/staging/speakup/speakup_decext.c

+10 −10
Original line number Diff line number Diff line
@@ -165,27 +165,27 @@ static void do_catch_up(struct spk_synth *synth) 
	jiffy_delta = spk_get_var(JIFFY);

	delay_time = spk_get_var(DELAY);



	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;

		}

		ch = synth_buffer_peek();

		set_current_state(TASK_INTERRUPTIBLE);

		delay_time_val = delay_time->u.n.value;

		spk_unlock(flags);

		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

		if (ch == '\n')

			ch = 0x0D;

		if (synth_full() || !spk_serial_out(ch)) {
@@ -193,9 +193,9 @@ static void do_catch_up(struct spk_synth *synth) 
			continue;

		}

		set_current_state(TASK_RUNNING);

		spk_lock(flags);

		spin_lock_irqsave(&speakup_info.spinlock, flags);

		synth_buffer_getc();

		spk_unlock(flags);

		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

		if (ch == '[')

			in_escape = 1;

		else if (ch == ']')
@@ -206,10 +206,10 @@ static void do_catch_up(struct spk_synth *synth) 
			if (jiffies >= jiff_max) {

				if (!in_escape)

					spk_serial_out(PROCSPEECH);

				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;