diff options
author | Frederik Völkel <frederik.voelkel@fau.de> | 2015-12-11 05:36:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 22:59:48 -0500 |
commit | ba4f10ae1b731a7c2ceff49977e6df336805b839 (patch) | |
tree | 857dbbbe1bf19529777b6f63cf7cf7aa57198631 /drivers/tty | |
parent | 858965d909db32fb567a06916bbebdb8951cd39e (diff) |
drivers: tty: 68328serial.c: Add missing spaces(checkpatch)
This patch adds missing spaces reported by checkpatch.
Signed-off-by: Frederik Völkel <frederik.voelkel@fau.de>
Signed-off-by: Lukas Braun <lukas.braun@fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/68328serial.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index 0140ba4aacde..4cdd8054db82 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c | |||
@@ -274,8 +274,8 @@ static void receive_chars(struct m68k_serial *info, unsigned short rx) | |||
274 | #endif | 274 | #endif |
275 | ch = GET_FIELD(rx, URX_RXDATA); | 275 | ch = GET_FIELD(rx, URX_RXDATA); |
276 | 276 | ||
277 | if(info->is_cons) { | 277 | if (info->is_cons) { |
278 | if(URX_BREAK & rx) { /* whee, break received */ | 278 | if (URX_BREAK & rx) { /* whee, break received */ |
279 | return; | 279 | return; |
280 | #ifdef CONFIG_MAGIC_SYSRQ | 280 | #ifdef CONFIG_MAGIC_SYSRQ |
281 | } else if (ch == 0x10) { /* ^P */ | 281 | } else if (ch == 0x10) { /* ^P */ |
@@ -302,7 +302,7 @@ static void receive_chars(struct m68k_serial *info, unsigned short rx) | |||
302 | 302 | ||
303 | tty_insert_flip_char(&info->tport, ch, flag); | 303 | tty_insert_flip_char(&info->tport, ch, flag); |
304 | #ifndef CONFIG_XCOPILOT_BUGS | 304 | #ifndef CONFIG_XCOPILOT_BUGS |
305 | } while((rx = uart->urx.w) & URX_DATA_READY); | 305 | } while ((rx = uart->urx.w) & URX_DATA_READY); |
306 | #endif | 306 | #endif |
307 | 307 | ||
308 | tty_schedule_flip(&info->tport); | 308 | tty_schedule_flip(&info->tport); |
@@ -330,7 +330,7 @@ static void transmit_chars(struct m68k_serial *info, struct tty_struct *tty) | |||
330 | info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1); | 330 | info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1); |
331 | info->xmit_cnt--; | 331 | info->xmit_cnt--; |
332 | 332 | ||
333 | if(info->xmit_cnt <= 0) { | 333 | if (info->xmit_cnt <= 0) { |
334 | /* All done for now... TX ints off */ | 334 | /* All done for now... TX ints off */ |
335 | uart->ustcnt &= ~USTCNT_TX_INTR_MASK; | 335 | uart->ustcnt &= ~USTCNT_TX_INTR_MASK; |
336 | goto clear_and_return; | 336 | goto clear_and_return; |
@@ -452,45 +452,45 @@ struct { | |||
452 | } | 452 | } |
453 | #ifndef CONFIG_M68VZ328 | 453 | #ifndef CONFIG_M68VZ328 |
454 | hw_baud_table[18] = { | 454 | hw_baud_table[18] = { |
455 | {0,0}, /* 0 */ | 455 | {0, 0}, /* 0 */ |
456 | {0,0}, /* 50 */ | 456 | {0, 0}, /* 50 */ |
457 | {0,0}, /* 75 */ | 457 | {0, 0}, /* 75 */ |
458 | {0,0}, /* 110 */ | 458 | {0, 0}, /* 110 */ |
459 | {0,0}, /* 134 */ | 459 | {0, 0}, /* 134 */ |
460 | {0,0}, /* 150 */ | 460 | {0, 0}, /* 150 */ |
461 | {0,0}, /* 200 */ | 461 | {0, 0}, /* 200 */ |
462 | {7,0x26}, /* 300 */ | 462 | {7, 0x26}, /* 300 */ |
463 | {6,0x26}, /* 600 */ | 463 | {6, 0x26}, /* 600 */ |
464 | {5,0x26}, /* 1200 */ | 464 | {5, 0x26}, /* 1200 */ |
465 | {0,0}, /* 1800 */ | 465 | {0, 0}, /* 1800 */ |
466 | {4,0x26}, /* 2400 */ | 466 | {4, 0x26}, /* 2400 */ |
467 | {3,0x26}, /* 4800 */ | 467 | {3, 0x26}, /* 4800 */ |
468 | {2,0x26}, /* 9600 */ | 468 | {2, 0x26}, /* 9600 */ |
469 | {1,0x26}, /* 19200 */ | 469 | {1, 0x26}, /* 19200 */ |
470 | {0,0x26}, /* 38400 */ | 470 | {0, 0x26}, /* 38400 */ |
471 | {1,0x38}, /* 57600 */ | 471 | {1, 0x38}, /* 57600 */ |
472 | {0,0x38}, /* 115200 */ | 472 | {0, 0x38}, /* 115200 */ |
473 | }; | 473 | }; |
474 | #else | 474 | #else |
475 | hw_baud_table[18] = { | 475 | hw_baud_table[18] = { |
476 | {0,0}, /* 0 */ | 476 | {0, 0}, /* 0 */ |
477 | {0,0}, /* 50 */ | 477 | {0, 0}, /* 50 */ |
478 | {0,0}, /* 75 */ | 478 | {0, 0}, /* 75 */ |
479 | {0,0}, /* 110 */ | 479 | {0, 0}, /* 110 */ |
480 | {0,0}, /* 134 */ | 480 | {0, 0}, /* 134 */ |
481 | {0,0}, /* 150 */ | 481 | {0, 0}, /* 150 */ |
482 | {0,0}, /* 200 */ | 482 | {0, 0}, /* 200 */ |
483 | {0,0}, /* 300 */ | 483 | {0, 0}, /* 300 */ |
484 | {7,0x26}, /* 600 */ | 484 | {7, 0x26}, /* 600 */ |
485 | {6,0x26}, /* 1200 */ | 485 | {6, 0x26}, /* 1200 */ |
486 | {0,0}, /* 1800 */ | 486 | {0, 0}, /* 1800 */ |
487 | {5,0x26}, /* 2400 */ | 487 | {5, 0x26}, /* 2400 */ |
488 | {4,0x26}, /* 4800 */ | 488 | {4, 0x26}, /* 4800 */ |
489 | {3,0x26}, /* 9600 */ | 489 | {3, 0x26}, /* 9600 */ |
490 | {2,0x26}, /* 19200 */ | 490 | {2, 0x26}, /* 19200 */ |
491 | {1,0x26}, /* 38400 */ | 491 | {1, 0x26}, /* 38400 */ |
492 | {0,0x26}, /* 57600 */ | 492 | {0, 0x26}, /* 57600 */ |
493 | {1,0x38}, /* 115200 */ | 493 | {1, 0x38}, /* 115200 */ |
494 | }; | 494 | }; |
495 | #endif | 495 | #endif |
496 | /* rate = 1036800 / ((65 - prescale) * (1<<divider)) */ | 496 | /* rate = 1036800 / ((65 - prescale) * (1<<divider)) */ |
@@ -591,8 +591,8 @@ void console_print_68328(const char *p) | |||
591 | { | 591 | { |
592 | char c; | 592 | char c; |
593 | 593 | ||
594 | while((c=*(p++)) != 0) { | 594 | while ((c = *(p++)) != 0) { |
595 | if(c == '\n') | 595 | if (c == '\n') |
596 | rs_put_char('\r'); | 596 | rs_put_char('\r'); |
597 | rs_put_char(c); | 597 | rs_put_char(c); |
598 | } | 598 | } |
@@ -624,7 +624,7 @@ static void rs_flush_chars(struct tty_struct *tty) | |||
624 | if (serial_paranoia_check(info, tty->name, "rs_flush_chars")) | 624 | if (serial_paranoia_check(info, tty->name, "rs_flush_chars")) |
625 | return; | 625 | return; |
626 | #ifndef USE_INTS | 626 | #ifndef USE_INTS |
627 | for(;;) { | 627 | for (;;) { |
628 | #endif | 628 | #endif |
629 | 629 | ||
630 | /* Enable transmitter */ | 630 | /* Enable transmitter */ |
@@ -700,7 +700,7 @@ static int rs_write(struct tty_struct * tty, | |||
700 | /* Enable transmitter */ | 700 | /* Enable transmitter */ |
701 | local_irq_disable(); | 701 | local_irq_disable(); |
702 | #ifndef USE_INTS | 702 | #ifndef USE_INTS |
703 | while(info->xmit_cnt) { | 703 | while (info->xmit_cnt) { |
704 | #endif | 704 | #endif |
705 | 705 | ||
706 | uart->ustcnt |= USTCNT_TXEN; | 706 | uart->ustcnt |= USTCNT_TXEN; |
@@ -1180,7 +1180,7 @@ rs68328_init(void) | |||
1180 | 1180 | ||
1181 | local_irq_save(flags); | 1181 | local_irq_save(flags); |
1182 | 1182 | ||
1183 | for(i=0;i<NR_PORTS;i++) { | 1183 | for (i = 0; i < NR_PORTS; i++) { |
1184 | 1184 | ||
1185 | info = &m68k_soft[i]; | 1185 | info = &m68k_soft[i]; |
1186 | tty_port_init(&info->tport); | 1186 | tty_port_init(&info->tport); |
@@ -1263,7 +1263,7 @@ int m68328_console_setup(struct console *cp, char *arg) | |||
1263 | return(-1); | 1263 | return(-1); |
1264 | 1264 | ||
1265 | if (arg) | 1265 | if (arg) |
1266 | n = simple_strtoul(arg,NULL,0); | 1266 | n = simple_strtoul(arg, NULL, 0); |
1267 | 1267 | ||
1268 | for (i = 0; i < ARRAY_SIZE(baud_table); i++) | 1268 | for (i = 0; i < ARRAY_SIZE(baud_table); i++) |
1269 | if (baud_table[i] == n) | 1269 | if (baud_table[i] == n) |