staging: speakup: speakup_decext.c: style fixes

* Clean this file based on reports from checkpatch.pl.
* Replace function-like macros with inline macros.
* Eliminate a use of the ternary operator, for readability.

Signed-off-by: Christopher Brannon <chris@the-brannons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Christopher Brannon 2010-10-14 19:23:51 -05:00 committed by Greg Kroah-Hartman
parent 64d1e5a098
commit 3d4f7eaf65
1 changed files with 24 additions and 13 deletions

View File

@ -35,9 +35,19 @@
#define SYNTH_CLEAR 0x03 #define SYNTH_CLEAR 0x03
#define PROCSPEECH 0x0b #define PROCSPEECH 0x0b
static unsigned char last_char; static unsigned char last_char;
#define get_last_char() ((inb_p(speakup_info.port_tts + UART_LSR) & UART_LSR_DR)? \
(last_char = inb_p(speakup_info.port_tts + UART_RX)) : last_char) static inline u_char get_last_char(void)
#define synth_full() (get_last_char() == 0x13) {
u_char avail = inb_p(speakup_info.port_tts + UART_LSR) & UART_LSR_DR;
if (avail)
last_char = inb_p(speakup_info.port_tts + UART_RX);
return last_char;
}
static inline bool synth_full(void)
{
return get_last_char() == 0x13;
}
static void do_catch_up(struct spk_synth *synth); static void do_catch_up(struct spk_synth *synth);
static void synth_flush(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth);
@ -200,7 +210,8 @@ static void do_catch_up(struct spk_synth *synth)
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); 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; jiff_max = jiffies + jiffy_delta_val;
} }
} }