Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial167: switch to int put_char method

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Cox and committed by
Linus Torvalds
a5b08c66 bbbbb96f

+4 -3
+4 -3
drivers/char/serial167.c
··· 1060 1060 1061 1061 } /* config_setup */ 1062 1062 1063 - static void cy_put_char(struct tty_struct *tty, unsigned char ch) 1063 + static int cy_put_char(struct tty_struct *tty, unsigned char ch) 1064 1064 { 1065 1065 struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; 1066 1066 unsigned long flags; ··· 1070 1070 #endif 1071 1071 1072 1072 if (serial_paranoia_check(info, tty->name, "cy_put_char")) 1073 - return; 1073 + return 0; 1074 1074 1075 1075 if (!info->xmit_buf) 1076 1076 return; ··· 1078 1078 local_irq_save(flags); 1079 1079 if (info->xmit_cnt >= PAGE_SIZE - 1) { 1080 1080 local_irq_restore(flags); 1081 - return; 1081 + return 0; 1082 1082 } 1083 1083 1084 1084 info->xmit_buf[info->xmit_head++] = ch; 1085 1085 info->xmit_head &= PAGE_SIZE - 1; 1086 1086 info->xmit_cnt++; 1087 1087 local_irq_restore(flags); 1088 + return 1; 1088 1089 } /* cy_put_char */ 1089 1090 1090 1091 static void cy_flush_chars(struct tty_struct *tty)