Skip to content

Commit

Permalink
staging: speakup: speakup_decpc.c: style fixes
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Christopher Brannon authored and Greg Kroah-Hartman committed Oct 15, 2010
1 parent 3d4f7ea commit 227e18d
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/staging/speakup/speakup_decpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 227e18d

Please sign in to comment.