summaryrefslogtreecommitdiff
path: root/drivers/staging/speakup
diff options
context:
space:
mode:
authorChristopher Brannon <cmbrannon79@gmail.com>2010-10-14 19:23:52 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-15 12:22:36 -0700
commit227e18d6b62550dafb822de2f3d673e3791a13e0 (patch)
tree969589315a29ef0f4415642849a417679875c2fd /drivers/staging/speakup
parent3d4f7eaf6526f82e61b090792d5c28c0eabd2175 (diff)
staging: speakup: speakup_decpc.c: style fixes
* Clean this file based on reports from checkpatch.pl. Signed-off-by: Christopher Brannon <chris@the-brannons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/speakup')
-rw-r--r--drivers/staging/speakup/speakup_decpc.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
index 490b758fb4e0..de25527decf6 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -149,14 +149,14 @@ static int in_escape, is_flushing;
static int dt_stat, dma_state;
static struct var_t vars[] = {
- { CAPS_START, .u.s = {"[:dv ap 200]" }},
- { CAPS_STOP, .u.s = {"[:dv ap 100]" }},
- { RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL }},
- { PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL }},
- { VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL }},
- { PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" }},
- { VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" }},
- { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+ { CAPS_START, .u.s = {"[:dv ap 200]" } },
+ { CAPS_STOP, .u.s = {"[:dv ap 100]" } },
+ { RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL } },
+ { PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL } },
+ { VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL } },
+ { PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" } },
+ { VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" } },
+ { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
V_LAST_VAR
};
@@ -367,7 +367,7 @@ oops: synth_release_region(speakup_info.port_tts, SYNTH_IO_EXTENT);
static void do_catch_up(struct spk_synth *synth)
{
u_char ch;
- static u_char last = '\0';
+ static u_char last;
unsigned long flags;
unsigned long jiff_max;
struct var_t *jiffy_delta;
@@ -422,7 +422,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;
}
}