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

serial m68k: put_char returns

Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Greg Ungerer <gerg@uclinux.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
09a6ffa8 9e7c9a19

+7 -5
+2 -1
drivers/serial/68328serial.c
··· 200 200 local_irq_restore(flags); 201 201 } 202 202 203 - static void rs_put_char(char ch) 203 + static int rs_put_char(char ch) 204 204 { 205 205 int flags, loops = 0; 206 206 ··· 214 214 UTX_TXDATA = ch; 215 215 udelay(5); 216 216 local_irq_restore(flags); 217 + return 1; 217 218 } 218 219 219 220 static void rs_start(struct tty_struct *tty)
+3 -2
drivers/serial/68360serial.c
··· 995 995 volatile QUICC_BD *bdp; 996 996 997 997 if (serial_paranoia_check(info, tty->name, "rs_put_char")) 998 - return; 998 + return 0; 999 999 1000 1000 if (!tty) 1001 - return; 1001 + return 0; 1002 1002 1003 1003 bdp = info->tx_cur; 1004 1004 while (bdp->status & BD_SC_READY); ··· 1016 1016 bdp++; 1017 1017 1018 1018 info->tx_cur = (QUICC_BD *)bdp; 1019 + return 1; 1019 1020 1020 1021 } 1021 1022
+2 -2
drivers/serial/mcfserial.c
··· 1897 1897 * This is used for console output. 1898 1898 */ 1899 1899 1900 - void mcfrs_put_char(char ch) 1900 + int mcfrs_put_char(char ch) 1901 1901 { 1902 1902 volatile unsigned char *uartp; 1903 1903 unsigned long flags; ··· 1921 1921 mcfrs_init_console(); /* try and get it back */ 1922 1922 local_irq_restore(flags); 1923 1923 1924 - return; 1924 + return 1; 1925 1925 } 1926 1926 1927 1927