diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2010-10-15 23:13:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 13:06:05 -0400 |
commit | a1277d85dc15a829d97b027de6e1f049c29a9306 (patch) | |
tree | 4ebf45d3d021eee5977907919c8a505d477a045c | |
parent | 7025005f15896118de7724b5e27c67e65612d32f (diff) |
staging: speakup: varhandlers.c style fixes
fix issues reported by checkpatch.pl
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/speakup/varhandlers.c | 109 |
1 files changed, 55 insertions, 54 deletions
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c index 2d137bd84df3..ab7de9389dd6 100644 --- a/drivers/staging/speakup/varhandlers.c +++ b/drivers/staging/speakup/varhandlers.c | |||
@@ -4,58 +4,58 @@ | |||
4 | #include "speakup.h" | 4 | #include "speakup.h" |
5 | 5 | ||
6 | static struct st_var_header var_headers[] = { | 6 | static struct st_var_header var_headers[] = { |
7 | { "version", VERSION, VAR_PROC, NULL, NULL }, | 7 | { "version", VERSION, VAR_PROC, NULL, NULL }, |
8 | { "synth_name", SYNTH, VAR_PROC, NULL, NULL }, | 8 | { "synth_name", SYNTH, VAR_PROC, NULL, NULL }, |
9 | { "keymap", KEYMAP, VAR_PROC, NULL, NULL }, | 9 | { "keymap", KEYMAP, VAR_PROC, NULL, NULL }, |
10 | { "silent", SILENT, VAR_PROC, NULL, NULL }, | 10 | { "silent", SILENT, VAR_PROC, NULL, NULL }, |
11 | { "punc_some", PUNC_SOME, VAR_PROC, NULL, NULL }, | 11 | { "punc_some", PUNC_SOME, VAR_PROC, NULL, NULL }, |
12 | { "punc_most", PUNC_MOST, VAR_PROC, NULL, NULL }, | 12 | { "punc_most", PUNC_MOST, VAR_PROC, NULL, NULL }, |
13 | { "punc_all", PUNC_ALL, VAR_PROC, NULL, NULL }, | 13 | { "punc_all", PUNC_ALL, VAR_PROC, NULL, NULL }, |
14 | { "delimiters", DELIM, VAR_PROC, NULL, NULL }, | 14 | { "delimiters", DELIM, VAR_PROC, NULL, NULL }, |
15 | { "repeats", REPEATS, VAR_PROC, NULL, NULL }, | 15 | { "repeats", REPEATS, VAR_PROC, NULL, NULL }, |
16 | { "ex_num", EXNUMBER, VAR_PROC, NULL, NULL }, | 16 | { "ex_num", EXNUMBER, VAR_PROC, NULL, NULL }, |
17 | { "characters", CHARS, VAR_PROC, NULL, NULL }, | 17 | { "characters", CHARS, VAR_PROC, NULL, NULL }, |
18 | { "synth_direct", SYNTH_DIRECT, VAR_PROC, NULL, NULL }, | 18 | { "synth_direct", SYNTH_DIRECT, VAR_PROC, NULL, NULL }, |
19 | { "caps_start", CAPS_START, VAR_STRING, str_caps_start, NULL }, | 19 | { "caps_start", CAPS_START, VAR_STRING, str_caps_start, NULL }, |
20 | { "caps_stop", CAPS_STOP, VAR_STRING, str_caps_stop, NULL }, | 20 | { "caps_stop", CAPS_STOP, VAR_STRING, str_caps_stop, NULL }, |
21 | { "delay_time", DELAY, VAR_TIME, NULL, NULL }, | 21 | { "delay_time", DELAY, VAR_TIME, NULL, NULL }, |
22 | { "trigger_time", TRIGGER, VAR_TIME, NULL, NULL }, | 22 | { "trigger_time", TRIGGER, VAR_TIME, NULL, NULL }, |
23 | { "jiffy_delta", JIFFY, VAR_TIME, NULL, NULL }, | 23 | { "jiffy_delta", JIFFY, VAR_TIME, NULL, NULL }, |
24 | { "full_time", FULL, VAR_TIME, NULL, NULL }, | 24 | { "full_time", FULL, VAR_TIME, NULL, NULL }, |
25 | { "spell_delay", SPELL_DELAY, VAR_NUM, &spell_delay, NULL }, | 25 | { "spell_delay", SPELL_DELAY, VAR_NUM, &spell_delay, NULL }, |
26 | { "bleeps", BLEEPS, VAR_NUM, &bleeps, NULL }, | 26 | { "bleeps", BLEEPS, VAR_NUM, &bleeps, NULL }, |
27 | { "attrib_bleep", ATTRIB_BLEEP, VAR_NUM, &attrib_bleep, NULL }, | 27 | { "attrib_bleep", ATTRIB_BLEEP, VAR_NUM, &attrib_bleep, NULL }, |
28 | { "bleep_time", BLEEP_TIME, VAR_TIME, &bleep_time, NULL }, | 28 | { "bleep_time", BLEEP_TIME, VAR_TIME, &bleep_time, NULL }, |
29 | { "cursor_time", CURSOR_TIME, VAR_TIME, NULL, NULL }, | 29 | { "cursor_time", CURSOR_TIME, VAR_TIME, NULL, NULL }, |
30 | { "punc_level", PUNC_LEVEL, VAR_NUM, &punc_level, NULL }, | 30 | { "punc_level", PUNC_LEVEL, VAR_NUM, &punc_level, NULL }, |
31 | { "reading_punc", READING_PUNC, VAR_NUM, &reading_punc, NULL }, | 31 | { "reading_punc", READING_PUNC, VAR_NUM, &reading_punc, NULL }, |
32 | { "say_control", SAY_CONTROL, VAR_NUM, &say_ctrl, NULL }, | 32 | { "say_control", SAY_CONTROL, VAR_NUM, &say_ctrl, NULL }, |
33 | { "say_word_ctl", SAY_WORD_CTL, VAR_NUM, &say_word_ctl, NULL }, | 33 | { "say_word_ctl", SAY_WORD_CTL, VAR_NUM, &say_word_ctl, NULL }, |
34 | { "no_interrupt", NO_INTERRUPT, VAR_NUM, &no_intr, NULL }, | 34 | { "no_interrupt", NO_INTERRUPT, VAR_NUM, &no_intr, NULL }, |
35 | { "key_echo", KEY_ECHO, VAR_NUM, &key_echo, NULL }, | 35 | { "key_echo", KEY_ECHO, VAR_NUM, &key_echo, NULL }, |
36 | { "bell_pos", BELL_POS, VAR_NUM, &bell_pos, NULL }, | 36 | { "bell_pos", BELL_POS, VAR_NUM, &bell_pos, NULL }, |
37 | { "rate", RATE, VAR_NUM, NULL, NULL }, | 37 | { "rate", RATE, VAR_NUM, NULL, NULL }, |
38 | { "pitch", PITCH, VAR_NUM, NULL, NULL }, | 38 | { "pitch", PITCH, VAR_NUM, NULL, NULL }, |
39 | { "vol", VOL, VAR_NUM, NULL, NULL }, | 39 | { "vol", VOL, VAR_NUM, NULL, NULL }, |
40 | { "tone", TONE, VAR_NUM, NULL, NULL }, | 40 | { "tone", TONE, VAR_NUM, NULL, NULL }, |
41 | { "punct", PUNCT, VAR_NUM, NULL, NULL }, | 41 | { "punct", PUNCT, VAR_NUM, NULL, NULL }, |
42 | { "voice", VOICE, VAR_NUM, NULL, NULL }, | 42 | { "voice", VOICE, VAR_NUM, NULL, NULL }, |
43 | { "freq", FREQUENCY, VAR_NUM, NULL, NULL }, | 43 | { "freq", FREQUENCY, VAR_NUM, NULL, NULL }, |
44 | { "lang", LANG, VAR_NUM, NULL, NULL }, | 44 | { "lang", LANG, VAR_NUM, NULL, NULL }, |
45 | { "chartab", CHARTAB, VAR_PROC, NULL, NULL }, | 45 | { "chartab", CHARTAB, VAR_PROC, NULL, NULL }, |
46 | { "direct", DIRECT, VAR_NUM, NULL, NULL }, | 46 | { "direct", DIRECT, VAR_NUM, NULL, NULL }, |
47 | }; | 47 | }; |
48 | 48 | ||
49 | static struct st_var_header *var_ptrs[MAXVARS] = { 0, 0, 0 }; | 49 | static struct st_var_header *var_ptrs[MAXVARS] = { 0, 0, 0 }; |
50 | 50 | ||
51 | static struct punc_var_t punc_vars[] = { | 51 | static struct punc_var_t punc_vars[] = { |
52 | { PUNC_SOME, 1 }, | 52 | { PUNC_SOME, 1 }, |
53 | { PUNC_MOST, 2 }, | 53 | { PUNC_MOST, 2 }, |
54 | { PUNC_ALL, 3 }, | 54 | { PUNC_ALL, 3 }, |
55 | { DELIM, 4 }, | 55 | { DELIM, 4 }, |
56 | { REPEATS, 5 }, | 56 | { REPEATS, 5 }, |
57 | { EXNUMBER, 6 }, | 57 | { EXNUMBER, 6 }, |
58 | { -1, -1 }, | 58 | { -1, -1 }, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | int chartab_get_value(char *keyword) | 61 | int chartab_get_value(char *keyword) |
@@ -154,8 +154,8 @@ struct st_var_header *var_header_by_name(const char *name) | |||
154 | struct var_t *get_var(enum var_id_t var_id) | 154 | struct var_t *get_var(enum var_id_t var_id) |
155 | { | 155 | { |
156 | BUG_ON(var_id < 0 || var_id >= MAXVARS); | 156 | BUG_ON(var_id < 0 || var_id >= MAXVARS); |
157 | BUG_ON(! var_ptrs[var_id]); | 157 | BUG_ON(!var_ptrs[var_id]); |
158 | return (var_ptrs[var_id]->data); | 158 | return var_ptrs[var_id]->data; |
159 | } | 159 | } |
160 | EXPORT_SYMBOL_GPL(get_var); | 160 | EXPORT_SYMBOL_GPL(get_var); |
161 | 161 | ||
@@ -238,7 +238,8 @@ int set_num_var(int input, struct st_var_header *var, int how) | |||
238 | if (!var_data->u.n.out_str) | 238 | if (!var_data->u.n.out_str) |
239 | l = sprintf(cp, var_data->u.n.synth_fmt, (int)val); | 239 | l = sprintf(cp, var_data->u.n.synth_fmt, (int)val); |
240 | else | 240 | else |
241 | l = sprintf(cp, var_data->u.n.synth_fmt, var_data->u.n.out_str[val]); | 241 | l = sprintf(cp, |
242 | var_data->u.n.synth_fmt, var_data->u.n.out_str[val]); | ||
242 | synth_printf("%s", cp); | 243 | synth_printf("%s", cp); |
243 | return ret; | 244 | return ret; |
244 | } | 245 | } |
@@ -252,15 +253,15 @@ int set_string_var(const char *page, struct st_var_header *var, int len) | |||
252 | if (len > MAXVARLEN) | 253 | if (len > MAXVARLEN) |
253 | return -E_TOOLONG; | 254 | return -E_TOOLONG; |
254 | if (!len) { | 255 | if (!len) { |
255 | if (!var_data->u.s.default_val) | 256 | if (!var_data->u.s.default_val) |
256 | return 0; | 257 | return 0; |
257 | ret = SET_DEFAULT; | 258 | ret = SET_DEFAULT; |
258 | if (!var->p_val) | 259 | if (!var->p_val) |
259 | var->p_val = var_data->u.s.default_val; | 260 | var->p_val = var_data->u.s.default_val; |
260 | if (var->p_val != var_data->u.s.default_val) | 261 | if (var->p_val != var_data->u.s.default_val) |
261 | strcpy((char *)var->p_val, var_data->u.s.default_val); | 262 | strcpy((char *)var->p_val, var_data->u.s.default_val); |
262 | } else if (var->p_val) | 263 | } else if (var->p_val) |
263 | strcpy((char *)var->p_val, page); | 264 | strcpy((char *)var->p_val, page); |
264 | else | 265 | else |
265 | return -E_TOOLONG; | 266 | return -E_TOOLONG; |
266 | return ret; | 267 | return ret; |