Commit 4073f1b6 authored by Christopher Brannon's avatar Christopher Brannon Committed by Greg Kroah-Hartman
Browse files

staging: speakup: speakup_dectlk.c: style fixes 



* Clean this file based on reports from checkpatch.pl.
* Replace a function-like macro with an inline function.
* Remove an incorrect use of the volatile qualifier.  The
previously-volatile variable is now always protected by a spinlock.

Signed-off-by: default avatarChristopher Brannon <chris@the-brannons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c3d5d988

drivers/staging/speakup/speakup_dectlk.c

+22 −15
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ 
#define DRV_VERSION "2.20"

#define SYNTH_CLEAR 0x03

#define PROCSPEECH 0x0b

static volatile int xoff;

#define synth_full() (xoff)

static int xoff;



static inline int synth_full(void)

{

	return xoff;

}



static void do_catch_up(struct spk_synth *synth);

static void synth_flush(struct spk_synth *synth);
@@ -160,7 +164,7 @@ static int is_indnum(u_char *ch) 
	return 0;

}



static u_char lastind = 0;

static u_char lastind;



static unsigned char get_index(void)

{
@@ -198,7 +202,8 @@ static void read_buff_add(u_char c) 


static void do_catch_up(struct spk_synth *synth)

{

	static u_char ch = 0;

	int synth_full_val = 0;

	static u_char ch;

	static u_char last = '\0';

	unsigned long flags;

	unsigned long jiff_max;
@@ -243,10 +248,11 @@ static void do_catch_up(struct spk_synth *synth) 
		ch = synth_buffer_peek();

		set_current_state(TASK_INTERRUPTIBLE);

		delay_time_val = delay_time->u.n.value;

		synth_full_val = synth_full();

		spk_unlock(flags);

		if (ch == '\n')

			ch = 0x0D;

		if (synth_full() || !spk_serial_out(ch)) {

		if (synth_full_val || !spk_serial_out(ch)) {

			schedule_timeout(msecs_to_jiffies(delay_time_val));

			continue;

		}
@@ -268,7 +274,8 @@ static void do_catch_up(struct spk_synth *synth) 
				jiffy_delta_val = jiffy_delta->u.n.value;

				delay_time_val = delay_time->u.n.value;

				spk_unlock(flags);

				schedule_timeout(msecs_to_jiffies(delay_time_val));

				schedule_timeout(msecs_to_jiffies

						 (delay_time_val));

				jiff_max = jiffies + jiffy_delta_val;

			}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE