staging: speakup: spaces preferred around operator
Fixed the checkpatch.pl issues like: CHECK: spaces preferred around that '&' (ctx:VxV) CHECK: spaces preferred around that '|' (ctx:VxV) CHECK: spaces preferred around that '-' (ctx:VxV) CHECK: spaces preferred around that '+' (ctx:VxV) etc. Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
23996ee52e
commit
205931ea88
6 changed files with 22 additions and 22 deletions
drivers/staging/speakup
|
@ -20,7 +20,7 @@
|
||||||
#define A_CAP 0x0007
|
#define A_CAP 0x0007
|
||||||
#define B_NUM 0x0008
|
#define B_NUM 0x0008
|
||||||
#define NUM 0x0009
|
#define NUM 0x0009
|
||||||
#define ALPHANUM (B_ALPHA|B_NUM)
|
#define ALPHANUM (B_ALPHA | B_NUM)
|
||||||
#define SOME 0x0010
|
#define SOME 0x0010
|
||||||
#define MOST 0x0020
|
#define MOST 0x0020
|
||||||
#define PUNC 0x0040
|
#define PUNC 0x0040
|
||||||
|
@ -30,14 +30,14 @@
|
||||||
#define B_EXNUM 0x0100
|
#define B_EXNUM 0x0100
|
||||||
#define CH_RPT 0x0200
|
#define CH_RPT 0x0200
|
||||||
#define B_CTL 0x0400
|
#define B_CTL 0x0400
|
||||||
#define A_CTL (B_CTL+SYNTH_OK)
|
#define A_CTL (B_CTL + SYNTH_OK)
|
||||||
#define B_SYM 0x0800
|
#define B_SYM 0x0800
|
||||||
#define B_CAPSYM (B_CAP|B_SYM)
|
#define B_CAPSYM (B_CAP | B_SYM)
|
||||||
|
|
||||||
/* FIXME: u16 */
|
/* FIXME: u16 */
|
||||||
#define IS_WDLM(x) (spk_chartab[((u_char)x)]&B_WDLM)
|
#define IS_WDLM(x) (spk_chartab[((u_char)x)] & B_WDLM)
|
||||||
#define IS_CHAR(x, type) (spk_chartab[((u_char)x)]&type)
|
#define IS_CHAR(x, type) (spk_chartab[((u_char)x)] & type)
|
||||||
#define IS_TYPE(x, type) ((spk_chartab[((u_char)x)]&type) == type)
|
#define IS_TYPE(x, type) ((spk_chartab[((u_char)x)] & type) == type)
|
||||||
|
|
||||||
int speakup_thread(void *data);
|
int speakup_thread(void *data);
|
||||||
void spk_reset_default_chars(void);
|
void spk_reset_default_chars(void);
|
||||||
|
|
|
@ -282,7 +282,7 @@ static int synth_probe(struct spk_synth *synth)
|
||||||
if (port_val == 0x53fc) {
|
if (port_val == 0x53fc) {
|
||||||
/* 'S' and out&input bits */
|
/* 'S' and out&input bits */
|
||||||
synth_port_control = synth_portlist[i];
|
synth_port_control = synth_portlist[i];
|
||||||
speakup_info.port_tts = synth_port_control+1;
|
speakup_info.port_tts = synth_port_control + 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -250,7 +250,7 @@ static int dt_getstatus(void)
|
||||||
static void dt_sendcmd(u_int cmd)
|
static void dt_sendcmd(u_int cmd)
|
||||||
{
|
{
|
||||||
outb_p(cmd & 0xFF, speakup_info.port_tts);
|
outb_p(cmd & 0xFF, speakup_info.port_tts);
|
||||||
outb_p((cmd >> 8) & 0xFF, speakup_info.port_tts+1);
|
outb_p((cmd >> 8) & 0xFF, speakup_info.port_tts + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dt_waitbit(int bit)
|
static int dt_waitbit(int bit)
|
||||||
|
@ -286,11 +286,11 @@ static int dt_ctrl(u_int cmd)
|
||||||
|
|
||||||
if (!dt_waitbit(STAT_cmd_ready))
|
if (!dt_waitbit(STAT_cmd_ready))
|
||||||
return -1;
|
return -1;
|
||||||
outb_p(0, speakup_info.port_tts+2);
|
outb_p(0, speakup_info.port_tts + 2);
|
||||||
outb_p(0, speakup_info.port_tts+3);
|
outb_p(0, speakup_info.port_tts + 3);
|
||||||
dt_getstatus();
|
dt_getstatus();
|
||||||
dt_sendcmd(CMD_control|cmd);
|
dt_sendcmd(CMD_control | cmd);
|
||||||
outb_p(0, speakup_info.port_tts+6);
|
outb_p(0, speakup_info.port_tts + 6);
|
||||||
while (dt_getstatus() & STAT_cmd_ready) {
|
while (dt_getstatus() & STAT_cmd_ready) {
|
||||||
udelay(20);
|
udelay(20);
|
||||||
if (--timeout == 0)
|
if (--timeout == 0)
|
||||||
|
@ -318,8 +318,8 @@ udelay(50);
|
||||||
break;
|
break;
|
||||||
udelay(50);
|
udelay(50);
|
||||||
}
|
}
|
||||||
outb_p(DMA_sync, speakup_info.port_tts+4);
|
outb_p(DMA_sync, speakup_info.port_tts + 4);
|
||||||
outb_p(0, speakup_info.port_tts+4);
|
outb_p(0, speakup_info.port_tts + 4);
|
||||||
udelay(100);
|
udelay(100);
|
||||||
for (timeout = 0; timeout < 10; timeout++) {
|
for (timeout = 0; timeout < 10; timeout++) {
|
||||||
if (!(dt_getstatus() & STAT_flushing))
|
if (!(dt_getstatus() & STAT_flushing))
|
||||||
|
@ -337,8 +337,8 @@ static int dt_sendchar(char ch)
|
||||||
return -1;
|
return -1;
|
||||||
if (!(dt_stat & STAT_rr_char))
|
if (!(dt_stat & STAT_rr_char))
|
||||||
return -2;
|
return -2;
|
||||||
outb_p(DMA_single_in, speakup_info.port_tts+4);
|
outb_p(DMA_single_in, speakup_info.port_tts + 4);
|
||||||
outb_p(ch, speakup_info.port_tts+4);
|
outb_p(ch, speakup_info.port_tts + 4);
|
||||||
dma_state ^= STAT_dma_state;
|
dma_state ^= STAT_dma_state;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -354,7 +354,7 @@ static int testkernel(void)
|
||||||
dt_sendcmd(CMD_sync);
|
dt_sendcmd(CMD_sync);
|
||||||
if (!dt_waitbit(STAT_cmd_ready))
|
if (!dt_waitbit(STAT_cmd_ready))
|
||||||
status = -2;
|
status = -2;
|
||||||
else if (dt_stat&0x8000)
|
else if (dt_stat & 0x8000)
|
||||||
return 0;
|
return 0;
|
||||||
else if (dt_stat == 0x0dec)
|
else if (dt_stat == 0x0dec)
|
||||||
pr_warn("dec_pc at 0x%x, software not loaded\n",
|
pr_warn("dec_pc at 0x%x, software not loaded\n",
|
||||||
|
|
|
@ -300,7 +300,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth)
|
||||||
t += 2;
|
t += 2;
|
||||||
for (i = 0; *t != '\r'; t++) {
|
for (i = 0; *t != '\r'; t++) {
|
||||||
status.rom_version[i] = *t;
|
status.rom_version[i] = *t;
|
||||||
if (i < sizeof(status.rom_version)-1)
|
if (i < sizeof(status.rom_version) - 1)
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
status.rom_version[i] = 0;
|
status.rom_version[i] = 0;
|
||||||
|
|
|
@ -142,9 +142,9 @@ static char *oops(void)
|
||||||
int s1, s2, s3, s4;
|
int s1, s2, s3, s4;
|
||||||
|
|
||||||
s1 = inb_p(synth_port);
|
s1 = inb_p(synth_port);
|
||||||
s2 = inb_p(synth_port+1);
|
s2 = inb_p(synth_port + 1);
|
||||||
s3 = inb_p(synth_port+2);
|
s3 = inb_p(synth_port + 2);
|
||||||
s4 = inb_p(synth_port+3);
|
s4 = inb_p(synth_port + 3);
|
||||||
pr_warn("synth timeout %d %d %d %d\n", s1, s2, s3, s4);
|
pr_warn("synth timeout %d %d %d %d\n", s1, s2, s3, s4);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -145,7 +145,7 @@ static void synth_interrogate(struct spk_synth *synth)
|
||||||
if (i > 2 && buf[i] == 0x7f)
|
if (i > 2 && buf[i] == 0x7f)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
t = buf+2;
|
t = buf + 2;
|
||||||
for (i = 0; *t != '\r'; t++) {
|
for (i = 0; *t != '\r'; t++) {
|
||||||
rom_v[i] = *t;
|
rom_v[i] = *t;
|
||||||
if (++i >= 19)
|
if (++i >= 19)
|
||||||
|
|
Loading…
Reference in a new issue